Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion src/app/core/data/access-status-data.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { AccessStatusObject } from 'src/app/shared/object-collection/shared/badg

import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
import { ObjectCacheService } from '../cache/object-cache.service';
import { HALEndpointService } from '../shared/hal-endpoint.service';
import { Bitstream } from '../shared/bitstream.model';
import { HALEndpointService } from '../shared/hal-endpoint.service';
import { Item } from '../shared/item.model';
import { BaseDataService } from './base/base-data.service';
import { RemoteData } from './remote-data';
Expand Down
4 changes: 2 additions & 2 deletions src/app/core/shared/bitstream.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import {
} from 'cerialize';
import { Observable } from 'rxjs';

import { AccessStatusObject } from '../../shared/object-collection/shared/badges/access-status-badge/access-status.model';
import { ACCESS_STATUS } from '../../shared/object-collection/shared/badges/access-status-badge/access-status.resource-type';
import {
link,
typedObject,
} from '../cache/builders/build-decorators';
import { RemoteData } from '../data/remote-data';
import { AccessStatusObject } from '../../shared/object-collection/shared/badges/access-status-badge/access-status.model';
import { ACCESS_STATUS } from '../../shared/object-collection/shared/badges/access-status-badge/access-status.resource-type';
import { BITSTREAM } from './bitstream.resource-type';
import { BitstreamFormat } from './bitstream-format.model';
import { BITSTREAM_FORMAT } from './bitstream-format.resource-type';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="flex-grow-1 ds-drop-list h-100" [class.disabled]="(draggingMdField$ | async) && (draggingMdField$ | async) !== mdField" cdkDropList (cdkDropListDropped)="drop($event)" role="table">
<ds-dso-edit-metadata-value-headers role="presentation" [dsoType]="dsoType"></ds-dso-edit-metadata-value-headers>
<ds-dso-edit-metadata-value *ngFor="let mdValue of form.fields[mdField]; let idx = index" role="presentation"
<ds-dso-edit-metadata-value-headers [dsoType]="dsoType"></ds-dso-edit-metadata-value-headers>
<ds-dso-edit-metadata-value *ngFor="let mdValue of form.fields[mdField]; let idx = index"
[dso]="dso"
[mdValue]="mdValue"
[mdField]="mdField"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="d-flex flex-row ds-field-row ds-header-row">
<div class="lbl-cell">{{ dsoType + '.edit.metadata.headers.field' | translate }}</div>
<div class="flex-grow-1">
<div class="d-flex flex-row ds-field-row ds-header-row" role="row">
<div class="lbl-cell" role="columnheader">{{ dsoType + '.edit.metadata.headers.field' | translate }}</div>
<div class="flex-grow-1" role="columnheader">
<div class="d-flex flex-row">
<div class="flex-grow-1 ds-flex-cell ds-value-cell"><b class="dont-break-out preserve-line-breaks">{{ dsoType + '.edit.metadata.headers.value' | translate }}</b></div>
<div class="ds-flex-cell ds-lang-cell"><b>{{ dsoType + '.edit.metadata.headers.language' | translate }}</b></div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</div>
<div class="flex-grow-1 ds-drop-list" role="cell">
<div role="table">
<ds-dso-edit-metadata-value-headers role="presentation" [dsoType]="dsoType"></ds-dso-edit-metadata-value-headers>
<ds-dso-edit-metadata-value-headers [dsoType]="dsoType"></ds-dso-edit-metadata-value-headers>
<ds-dso-edit-metadata-value [dso]="dso"
[mdValue]="form.newValue"
[dsoType]="dsoType"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { Bitstream } from '../../core/shared/bitstream.model';
import { Item } from '../../core/shared/item.model';
import { URLCombiner } from '../../core/url-combiner/url-combiner';
import { getItemModuleRoute } from '../../item-page/item-page-routing-paths';
import { ThemedAccessStatusBadgeComponent } from '../object-collection/shared/badges/access-status-badge/themed-access-status-badge.component';
import { ActivatedRouteStub } from '../testing/active-router.stub';
import { RouterLinkDirectiveStub } from '../testing/router-link-directive.stub';
import { FileDownloadLinkComponent } from './file-download-link.component';
Expand Down Expand Up @@ -66,7 +67,7 @@ describe('FileDownloadLinkComponent', () => {
],
})
.overrideComponent(FileDownloadLinkComponent, {
remove: { imports: [RouterLink] },
remove: { imports: [RouterLink, ThemedAccessStatusBadgeComponent] },
add: { imports: [RouterLinkDirectiveStub] },
})
.compileComponents();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import { LinkService } from '../../../../../core/cache/builders/link.service';
import { Bitstream } from '../../../../../core/shared/bitstream.model';
import { Item } from '../../../../../core/shared/item.model';
import { getFirstSucceededRemoteDataPayload } from '../../../../../core/shared/operators';
import { followLink } from '../../../../utils/follow-link-config.model';
import { hasValue } from '../../../../empty.util';
import { followLink } from '../../../../utils/follow-link-config.model';
import { AccessStatusObject } from './access-status.model';

@Component({
Expand Down
2 changes: 2 additions & 0 deletions src/app/thumbnail/thumbnail.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@ describe('ThumbnailComponent', () => {
format: { href: 'format.url' },
content: { href: CONTENT },
thumbnail: undefined,
accessStatus: { href: 'accessStatus.url' },
};
comp.thumbnail = thumbnail;
});
Expand Down Expand Up @@ -324,6 +325,7 @@ describe('ThumbnailComponent', () => {
format: { href: 'format.url' },
content: { href: CONTENT },
thumbnail: undefined,
accessStatus: { href: 'accessStatus.url' },
};
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import { Component } from '@angular/core';
import { RouterLink } from '@angular/router';
import { TranslateModule } from '@ngx-translate/core';

import { ThemedAccessStatusBadgeComponent } from '../../../../../app/shared/object-collection/shared/badges/access-status-badge/themed-access-status-badge.component';
import { FileDownloadLinkComponent as BaseComponent } from '../../../../../app/shared/file-download-link/file-download-link.component';
import { ThemedAccessStatusBadgeComponent } from '../../../../../app/shared/object-collection/shared/badges/access-status-badge/themed-access-status-badge.component';

@Component({
selector: 'ds-themed-file-download-link',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,13 @@ import {
} from 'rxjs';

import { DSONameService } from '../../../../../../../app/core/breadcrumbs/dso-name.service';
import { AccessStatusDataService } from '../../../../../../../app/core/data/access-status-data.service';
import { BitstreamDataService } from '../../../../../../../app/core/data/bitstream-data.service';
import { PaginatedList } from '../../../../../../../app/core/data/paginated-list.model';
import { RemoteData } from '../../../../../../../app/core/data/remote-data';
import { PaginationService } from '../../../../../../../app/core/pagination/pagination.service';
import { Bitstream } from '../../../../../../../app/core/shared/bitstream.model';
import { getFirstCompletedRemoteData } from '../../../../../../../app/core/shared/operators';
import { DownloadLinkService } from '../../../../../../../app/datashare/download-link.service';
import { FileSectionComponent as BaseComponent } from '../../../../../../../app/item-page/simple/field-components/file-section/file-section.component';
import { GenericItemPageFieldComponent } from '../../../../../../../app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component';
Expand All @@ -34,18 +36,6 @@ import {
import { ThemedFileDownloadLinkComponent } from '../../../../../../../app/shared/file-download-link/themed-file-download-link.component';
import { ThemedLoadingComponent } from '../../../../../../../app/shared/loading/themed-loading.component';
import { MetadataFieldWrapperComponent } from '../../../../../../../app/shared/metadata-field-wrapper/metadata-field-wrapper.component';
import { FileSizePipe } from '../../../../../../../app/shared/utils/file-size-pipe';
import { VarDirective } from '../../../../../../../app/shared/utils/var.directive';
import { getFirstCompletedRemoteData } from '../../../../../../../app/core/shared/operators';
import { filter, map, Observable, switchMap, tap } from 'rxjs';
import { RemoteData } from '../../../../../../../app/core/data/remote-data';
import { PaginatedList } from '../../../../../../../app/core/data/paginated-list.model';
import { Bitstream } from '../../../../../../../app/core/shared/bitstream.model';
import { hasValue, isEmpty } from '../../../../../../../app/shared/empty.util';
import { PaginationComponentOptions } from '../../../../../../../app/shared/pagination/pagination-component-options.model';
import { followLink } from '../../../../../../../app/shared/utils/follow-link-config.model';
import { BitstreamDataService } from '../../../../../../../app/core/data/bitstream-data.service';
import { AccessStatusDataService } from '../../../../../../../app/core/data/access-status-data.service';
import { NotificationsService } from '../../../../../../../app/shared/notifications/notifications.service';
import { PaginationComponent } from '../../../../../../../app/shared/pagination/pagination.component';
import { PaginationComponentOptions } from '../../../../../../../app/shared/pagination/pagination-component-options.model';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import { Component } from '@angular/core';
import { RouterLink } from '@angular/router';
import { TranslateModule } from '@ngx-translate/core';

import { ThemedAccessStatusBadgeComponent } from '../../../../../app/shared/object-collection/shared/badges/access-status-badge/themed-access-status-badge.component';
import { FileDownloadLinkComponent as BaseComponent } from '../../../../../app/shared/file-download-link/file-download-link.component';
import { ThemedAccessStatusBadgeComponent } from '../../../../../app/shared/object-collection/shared/badges/access-status-badge/themed-access-status-badge.component';

@Component({
selector: 'ds-themed-file-download-link',
Expand Down
Loading