From 302dd2036b51c90a11234bade08ea2624d2f252c Mon Sep 17 00:00:00 2001 From: nsemets Date: Fri, 19 Sep 2025 15:27:49 +0300 Subject: [PATCH 1/5] fix(contributors): fixed contributors 2 bugs --- .../my-projects/mappers/my-resources.mapper.ts | 8 ++++---- .../add-contributor-dialog.component.html | 4 ++-- .../add-contributor-dialog.component.scss | 6 ------ .../cookie-consent/cookie-consent.component.html | 6 +----- .../mappers/contributors/contributors.mapper.ts | 4 ++-- .../icons/socials/{baidu.png => baiduScholar.png} | Bin 6 files changed, 9 insertions(+), 19 deletions(-) rename src/assets/icons/socials/{baidu.png => baiduScholar.png} (100%) diff --git a/src/app/features/my-projects/mappers/my-resources.mapper.ts b/src/app/features/my-projects/mappers/my-resources.mapper.ts index 8fafdb4dc..767338291 100644 --- a/src/app/features/my-projects/mappers/my-resources.mapper.ts +++ b/src/app/features/my-projects/mappers/my-resources.mapper.ts @@ -11,10 +11,10 @@ export class MyResourcesMapper { isPublic: response.attributes.public, contributors: response.embeds?.bibliographic_contributors?.data?.map((contributor) => ({ - familyName: contributor.embeds.users.data.attributes.family_name, - fullName: contributor.embeds.users.data.attributes.full_name, - givenName: contributor.embeds.users.data.attributes.given_name, - middleName: contributor.embeds.users.data.attributes.middle_name, + familyName: contributor.embeds.users.data?.attributes.family_name, + fullName: contributor.embeds.users.data?.attributes.full_name, + givenName: contributor.embeds.users.data?.attributes.given_name, + middleName: contributor.embeds.users.data?.attributes.middle_name, })) ?? [], }; } diff --git a/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.html b/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.html index f471d1f6f..fec8b68d7 100644 --- a/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.html +++ b/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.html @@ -11,8 +11,8 @@ } @else { @for (item of users(); track $index) {
- - + + {{ item.fullName }}
} diff --git a/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.scss b/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.scss index 866f8bf02..5b56d123d 100644 --- a/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.scss +++ b/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.scss @@ -1,11 +1,5 @@ @use "styles/mixins" as mix; -.label { - color: var(--dark-blue-1); - margin: 0; - cursor: pointer; -} - .border-divider { border-bottom: 1px solid var(--grey-2); } diff --git a/src/app/shared/components/cookie-consent/cookie-consent.component.html b/src/app/shared/components/cookie-consent/cookie-consent.component.html index 7d6f5baae..409e35808 100644 --- a/src/app/shared/components/cookie-consent/cookie-consent.component.html +++ b/src/app/shared/components/cookie-consent/cookie-consent.component.html @@ -3,11 +3,7 @@
{{ message.detail }}
- +
diff --git a/src/app/shared/mappers/contributors/contributors.mapper.ts b/src/app/shared/mappers/contributors/contributors.mapper.ts index d344f1e02..505c81865 100644 --- a/src/app/shared/mappers/contributors/contributors.mapper.ts +++ b/src/app/shared/mappers/contributors/contributors.mapper.ts @@ -36,8 +36,8 @@ export class ContributorsMapper { ({ id: user.id, fullName: user.attributes.full_name, - isBibliographic: false, - permission: ContributorPermission.Read, + isBibliographic: true, + permission: ContributorPermission.Write, }) as ContributorAddModel ), totalCount: response.meta.total, diff --git a/src/assets/icons/socials/baidu.png b/src/assets/icons/socials/baiduScholar.png similarity index 100% rename from src/assets/icons/socials/baidu.png rename to src/assets/icons/socials/baiduScholar.png From 7751f1c1e504dccc6473a13e4b3af109d55e6dba Mon Sep 17 00:00:00 2001 From: nsemets Date: Fri, 19 Sep 2025 16:49:35 +0300 Subject: [PATCH 2/5] fix(styles): fixed styles for contributors --- .../add-contributor-dialog.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.html b/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.html index fec8b68d7..6a490975d 100644 --- a/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.html +++ b/src/app/shared/components/contributors/add-contributor-dialog/add-contributor-dialog.component.html @@ -12,7 +12,7 @@ @for (item of users(); track $index) {
- {{ item.fullName }} + {{ item.fullName }}
} From afce0263e5f1db27242c239ab3aa7bea8f2266e0 Mon Sep 17 00:00:00 2001 From: nsemets Date: Fri, 19 Sep 2025 17:15:43 +0300 Subject: [PATCH 3/5] fix(resource-information): fixed bug --- .../resource-information-dialog.component.ts | 5 +---- .../metadata/models/resource-information-form.model.ts | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/app/features/metadata/dialogs/resource-information-dialog/resource-information-dialog.component.ts b/src/app/features/metadata/dialogs/resource-information-dialog/resource-information-dialog.component.ts index c82ad5d28..2a2964287 100644 --- a/src/app/features/metadata/dialogs/resource-information-dialog/resource-information-dialog.component.ts +++ b/src/app/features/metadata/dialogs/resource-information-dialog/resource-information-dialog.component.ts @@ -28,10 +28,7 @@ export class ResourceInformationDialogComponent implements OnInit { nonNullable: true, validators: [Validators.required], }), - resourceLanguage: new FormControl('', { - nonNullable: true, - validators: [Validators.required], - }), + resourceLanguage: new FormControl(''), }); resourceTypeOptions = RESOURCE_TYPE_OPTIONS; diff --git a/src/app/features/metadata/models/resource-information-form.model.ts b/src/app/features/metadata/models/resource-information-form.model.ts index c67c4d946..a78c22aa5 100644 --- a/src/app/features/metadata/models/resource-information-form.model.ts +++ b/src/app/features/metadata/models/resource-information-form.model.ts @@ -2,5 +2,5 @@ import { FormControl } from '@angular/forms'; export interface ResourceInformationForm { resourceType: FormControl; - resourceLanguage: FormControl; + resourceLanguage: FormControl; } From 6ece61f2d3bc5e95093fe99e58ee1e9fc322df9c Mon Sep 17 00:00:00 2001 From: nsemets Date: Fri, 19 Sep 2025 17:24:39 +0300 Subject: [PATCH 4/5] fix(search): fixed search config --- src/app/shared/stores/global-search/global-search.state.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/app/shared/stores/global-search/global-search.state.ts b/src/app/shared/stores/global-search/global-search.state.ts index 22da0a9a8..87a83725a 100644 --- a/src/app/shared/stores/global-search/global-search.state.ts +++ b/src/app/shared/stores/global-search/global-search.state.ts @@ -34,7 +34,6 @@ import { GLOBAL_SEARCH_STATE_DEFAULTS, GlobalSearchStateModel } from './global-s export class GlobalSearchState { private searchService = inject(GlobalSearchService); private readonly environment = inject(ENVIRONMENT); - private readonly webUrl = this.environment.webUrl; @Action(FetchResources) fetchResources(ctx: StateContext): Observable { @@ -317,7 +316,7 @@ export class GlobalSearchState { }); filtersParams['cardSearchFilter[resourceType]'] = getResourceTypeStringFromEnum(state.resourceType); - filtersParams['cardSearchFilter[accessService]'] = `${this.webUrl}/`; + filtersParams['cardSearchFilter[accessService]'] = `${this.environment.webUrl}/`; filtersParams['cardSearchText[*,creator.name,isContainedBy.creator.name]'] = state.searchText ?? ''; filtersParams['page[size]'] = '10'; From 28cd9f646e93eef3290fe7fd343b6211defbcfcf Mon Sep 17 00:00:00 2001 From: nsemets Date: Fri, 19 Sep 2025 18:10:45 +0300 Subject: [PATCH 5/5] fix(addons): fixed addons --- .../features/project/addons/services/addon-dialog.service.ts | 3 ++- src/app/shared/services/banners.service.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/features/project/addons/services/addon-dialog.service.ts b/src/app/features/project/addons/services/addon-dialog.service.ts index 46c66bf0f..e1ba2fe3d 100644 --- a/src/app/features/project/addons/services/addon-dialog.service.ts +++ b/src/app/features/project/addons/services/addon-dialog.service.ts @@ -9,7 +9,8 @@ import { inject, Injectable } from '@angular/core'; import { AddonServiceNames } from '@osf/shared/enums'; import { AuthorizedAccountModel, ConfiguredAddonModel } from '@osf/shared/models'; -import { ConfirmAccountConnectionModalComponent, DisconnectAddonModalComponent } from '../components'; +import { ConfirmAccountConnectionModalComponent } from '../components/confirm-account-connection-modal/confirm-account-connection-modal.component'; +import { DisconnectAddonModalComponent } from '../components/disconnect-addon-modal/disconnect-addon-modal.component'; @Injectable({ providedIn: 'root', diff --git a/src/app/shared/services/banners.service.ts b/src/app/shared/services/banners.service.ts index c4dec92cd..4a48f613c 100644 --- a/src/app/shared/services/banners.service.ts +++ b/src/app/shared/services/banners.service.ts @@ -37,7 +37,7 @@ export class BannersService { */ getCurrentBanner(): Observable { return this.jsonApiService - .get>(`${this.apiDomainUrl}/_/banners/current`) + .get>(`${this.apiDomainUrl}/_/banners/current/`) .pipe(map((response) => BannerMapper.fromResponse(response.data))); } }