diff --git a/src/app/features/metadata/metadata.component.ts b/src/app/features/metadata/metadata.component.ts index a3ffe6340..dfa3e6f93 100644 --- a/src/app/features/metadata/metadata.component.ts +++ b/src/app/features/metadata/metadata.component.ts @@ -338,6 +338,7 @@ export class MetadataComponent implements OnInit { this.customDialogService .open(ContributorsDialogComponent, { header: this.translateService.instant('project.metadata.contributors.editContributors'), + width: '600px', data: { resourceId: this.resourceId, resourceType: this.resourceType(), diff --git a/src/app/features/registries/components/registries-metadata-step/registries-contributors/registries-contributors.component.html b/src/app/features/registries/components/registries-metadata-step/registries-contributors/registries-contributors.component.html index a9a42db3f..c93d6cb76 100644 --- a/src/app/features/registries/components/registries-metadata-step/registries-contributors/registries-contributors.component.html +++ b/src/app/features/registries/components/registries-metadata-step/registries-contributors/registries-contributors.component.html @@ -13,10 +13,10 @@

{{ 'project.overview.metadata.contributors' | translate }}

@if (hasChanges) {
- - + +
} - +
diff --git a/src/app/shared/components/contributors/contributors-table/contributors-table.component.html b/src/app/shared/components/contributors/contributors-table/contributors-table.component.html index 3193a56b1..373fd1ae5 100644 --- a/src/app/shared/components/contributors/contributors-table/contributors-table.component.html +++ b/src/app/shared/components/contributors/contributors-table/contributors-table.component.html @@ -15,7 +15,11 @@ > - + + @if (deactivatedContributors()) { + + } + {{ 'project.contributors.table.headers.name' | translate }}
@@ -62,9 +66,11 @@ @if (contributor.id) { -
- -
+ @if (!deactivatedContributors()) { +
+ +
+ } diff --git a/src/app/shared/components/contributors/contributors-table/contributors-table.component.ts b/src/app/shared/components/contributors/contributors-table/contributors-table.component.ts index 98a18206b..6b56259eb 100644 --- a/src/app/shared/components/contributors/contributors-table/contributors-table.component.ts +++ b/src/app/shared/components/contributors/contributors-table/contributors-table.component.ts @@ -18,6 +18,7 @@ import { ContributorModel, SelectOption, TableParameters } from '@osf/shared/mod import { CustomDialogService } from '@osf/shared/services'; import { IconComponent } from '../../icon/icon.component'; +import { InfoIconComponent } from '../../info-icon/info-icon.component'; @Component({ selector: 'osf-contributors-table', @@ -31,6 +32,7 @@ import { IconComponent } from '../../icon/icon.component'; Button, SelectComponent, IconComponent, + InfoIconComponent, ], templateUrl: './contributors-table.component.html', styleUrl: './contributors-table.component.scss', @@ -60,6 +62,8 @@ export class ContributorsTableComponent { isProject = computed(() => this.resourceType() === ResourceType.Project); + deactivatedContributors = computed(() => this.contributors().some((contributor) => contributor.deactivated)); + canRemoveContributor = computed(() => { const contributors = this.contributors(); const currentUserId = this.currentUserId(); diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 60b7ee980..ab1952cb4 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -544,6 +544,7 @@ "searchRegistrationPlaceholder": "Search Registration Contributors", "permissionFilter": "Filter by permission", "bibliographyFilter": "Bibliography", + "reorderDeactivateTooltip": "Remove deactivated contributors in order to enable reordering.", "permissions": { "administrator": "Administrator", "readAndWrite": "Read + Write",