Skip to content

[ENG-9618] handle no affiliated user in admin table panel #801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brianjgeiger merged 1 commit into from
Dec 3, 2025
Merged

[ENG-9618] handle no affiliated user in admin table panel #801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
53 changes: 31 additions & 22 deletions src/app/features/admin-institutions/components/admin-table/admin-table.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,30 +122,39 @@
</a>
} @else if (col.isLink && col.isArray && isLinkArray(currentColumnField)) {
<div class="flex gap-1 align-items-center flex-wrap">
@for (link of currentColumnField; track $index) {
@if (currentColumnField.length === 0 && col.field === 'creator') {
<div class="flex-1 flex align-items-center gap-1">
<a
[href]="link.url"
[target]="col.linkTarget ?? '_self'"
class="font-bold"
[ngClass]="{ 'max-w-link-with-icon': col.showIcon, 'max-w-full-link': !col.showIcon }"
>
<span class="overflow-hidden text-overflow-ellipsis whitespace-nowrap block">
{{ link.text + ($last ? '' : ',') }}</span
>
</a>
@if (col.showIcon) {
<p-button
[pTooltip]="col.iconTooltip | translate"
class="icon-button"
[icon]="col.iconClass"
variant="text"
severity="info"
[ariaLabel]="'common.accessibility.tooltipBtn' | translate"
(onClick)="onIconClick(rowData, col, $index)"
/>
}
<osf-info-icon
[tooltipText]="'adminInstitutions.institutionUsers.notBibliographicOrAffiliatedUserText'"
tooltipPosition="bottom"
></osf-info-icon>
</div>
} @else {
@for (link of currentColumnField; track $index) {
<div class="flex-1 flex align-items-center gap-1">
<a
[href]="link.url"
[target]="col.linkTarget ?? '_self'"
class="font-bold"
[ngClass]="{ 'max-w-link-with-icon': col.showIcon, 'max-w-full-link': !col.showIcon }"
>
<span class="overflow-hidden text-overflow-ellipsis whitespace-nowrap block">
{{ link.text + ($last ? '' : ',') }}</span
>
</a>
@if (col.showIcon) {
<p-button
[pTooltip]="col.iconTooltip | translate"
class="icon-button"
[icon]="col.iconClass"
variant="text"
severity="info"
[ariaLabel]="'common.accessibility.tooltipBtn' | translate"
(onClick)="onIconClick(rowData, col, $index)"
/>
}
</div>
}
}
</div>
} @else {
Expand Down
2 changes: 2 additions & 0 deletions src/app/features/admin-institutions/components/admin-table/admin-table.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
TableIconClickEvent,
} from '@osf/features/admin-institutions/models';
import { CustomPaginatorComponent } from '@osf/shared/components/custom-paginator/custom-paginator.component';
import { InfoIconComponent } from '@osf/shared/components/info-icon/info-icon.component';
import { StopPropagationDirective } from '@osf/shared/directives/stop-propagation.directive';
import { PaginationLinksModel } from '@osf/shared/models/pagination-links.model';
import { SearchFilters } from '@osf/shared/models/search-filters.model';
Expand All @@ -43,6 +44,7 @@ import { DownloadType } from '../../enums';
StopPropagationDirective,
DatePipe,
NgClass,
InfoIconComponent,
],
templateUrl: './admin-table.component.html',
styleUrl: './admin-table.component.scss',
Expand Down
3 changes: 2 additions & 1 deletion src/assets/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2884,7 +2884,8 @@
"orcid": "ORCID",
"noData": "No users found",
"messageSent": "Message has been sent.",
"requestSent": "Request has been sent."
"requestSent": "Request has been sent.",
"notBibliographicOrAffiliatedUserText": "The user is not bibliographic or no longer affiliated with the institution"
},
"projects": {
"title": "Title",
Expand Down