Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f413328
115491: Refactor retrieval of IIIF status
AAwouters Jun 12, 2024
ff0c128
115491: Remove unused route parameters
AAwouters Jun 12, 2024
9c1624a
115491: Combine observables into object
AAwouters Jun 12, 2024
4fa2017
115491: Apply minor code restructuring
AAwouters Jun 13, 2024
893c666
115491: Turn constant fields into actual constants
AAwouters Jun 13, 2024
16c75db
115491: Split form creation into multiple methods
AAwouters Jun 13, 2024
e83ad08
115491: Track subscription
AAwouters Jun 13, 2024
66823ce
115491: Integrate subscription into pipe
AAwouters Jun 14, 2024
23a29ba
115491: Always retrieve fresh data
AAwouters Jun 14, 2024
1c93e4f
115491: Simplify update logic
AAwouters Jun 14, 2024
6195b8d
115491: Make better use of the type system
AAwouters Jun 14, 2024
ff2fbf1
115491: Restructure bitstream update code
AAwouters Jun 14, 2024
28fe5ae
115491: Fix test after refactor
AAwouters Jun 14, 2024
f0782e8
115491: Export interfaces
AAwouters Jun 17, 2024
ce3e2c7
115491: Export consts
AAwouters Mar 6, 2025
6002f76
115491: Add doc comments & apply minor fixes
AAwouters Mar 18, 2025
e0ad6a8
Merge branch 'edit-bitstream-page-refactor-7.6' into edit-bitstream-p…
AAwouters Mar 19, 2025
ff00b75
138123: implement UI for bundle deletion
Jan 28, 2026
3f12fe6
Merge remote-tracking branch 'dspace/main' into edit-bitstream-page-r…
Atmire-Kristof Jan 29, 2026
3d7a2a5
138116: Fixed bundle invalidation when removing bundles & other minor…
alexandrevryghem Jan 30, 2026
b7855de
138123: fix list not updating onCreate
Jan 30, 2026
30a3d53
138123: fix UI on small screens
Jan 30, 2026
8e199a6
138123: Show notifiaction based on what was deleted
Jan 30, 2026
dde6647
138123: introduce and fix tests
Jan 30, 2026
814ac8a
Merge remote-tracking branch 'origin/w2p-138123_delete-bundles_contri…
Mar 22, 2026
e1663ee
Merge upstream/main into w2p-138875 bundle delete branch
Mar 22, 2026
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ng-container *ngVar="(bitstreamRD$ | async) as bitstreamRD">
<div class="container">
@if (bitstreamRD?.hasSucceeded) {
@if (bitstreamRD?.hasSucceeded && (isLoading$ | async) === false) {
<div class="row">
<div class="col-md-2">
<ds-thumbnail [thumbnail]="bitstreamRD?.payload"></ds-thumbnail>
Expand Down Expand Up @@ -33,9 +33,8 @@ <h1 class="h2 dont-break-out">{{dsoNameService.getName(bitstreamRD?.payload)}} <
@if (bitstreamRD?.hasFailed) {
<ds-error message="{{'error.bitstream' | translate}}"></ds-error>
}
@if (!bitstreamRD || bitstreamRD?.isLoading) {
<ds-loading
message="{{'loading.bitstream' | translate}}"></ds-loading>
@if (!bitstreamRD || bitstreamRD?.isLoading || (isLoading$ | async)) {
<ds-loading message="{{'loading.bitstream' | translate}}"></ds-loading>
}
</div>
</ng-container>
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ describe('EditBitstreamPageComponent', () => {

bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
findAll: createSuccessfulRemoteDataObject$(createPaginatedList(allFormats)),
findByHref: createSuccessfulRemoteDataObject$(selectedFormat),
});

notificationsService = jasmine.createSpyObj('notificationsService',
Expand Down Expand Up @@ -161,6 +162,7 @@ describe('EditBitstreamPageComponent', () => {
});

describe('EditBitstreamPageComponent no IIIF fields', () => {
const dsoNameServiceReturnValue = 'ORIGINAL';

beforeEach(waitForAsync(() => {
bundle = {
Expand All @@ -176,7 +178,6 @@ describe('EditBitstreamPageComponent', () => {
},
})),
};
const bundleName = 'ORIGINAL';

bitstream = Object.assign(new Bitstream(), {
uuid: bitstreamID,
Expand All @@ -196,6 +197,7 @@ describe('EditBitstreamPageComponent', () => {
format: createSuccessfulRemoteDataObject$(selectedFormat),
_links: {
self: 'bitstream-selflink',
format: 'format-link',
},
bundle: createSuccessfulRemoteDataObject$(bundle),
});
Expand All @@ -209,9 +211,10 @@ describe('EditBitstreamPageComponent', () => {
});
bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
findAll: createSuccessfulRemoteDataObject$(createPaginatedList(allFormats)),
findByHref: createSuccessfulRemoteDataObject$(selectedFormat),
});
dsoNameService = jasmine.createSpyObj('dsoNameService', {
getName: bundleName,
getName: dsoNameServiceReturnValue,
});

TestBed.configureTestingModule({
Expand Down Expand Up @@ -253,7 +256,7 @@ describe('EditBitstreamPageComponent', () => {
});

it('should fill in the bitstream\'s title', () => {
expect(rawForm.fileNamePrimaryContainer.fileName).toEqual(bitstream.name);
expect(rawForm.fileNamePrimaryContainer.fileName).toEqual(dsoNameServiceReturnValue);
});

it('should fill in the bitstream\'s description', () => {
Expand Down Expand Up @@ -432,7 +435,7 @@ describe('EditBitstreamPageComponent', () => {
});
describe('when navigateToItemEditBitstreams is called', () => {
it('should redirect to the item edit page on the bitstreams tab with the itemId from the component', () => {
comp.itemId = 'some-uuid1';
comp.item.uuid = 'some-uuid1';
comp.navigateToItemEditBitstreams();
expect(router.navigate).toHaveBeenCalledWith([getEntityEditRoute(null, 'some-uuid1'), 'bitstreams']);
});
Expand Down Expand Up @@ -481,6 +484,7 @@ describe('EditBitstreamPageComponent', () => {
format: createSuccessfulRemoteDataObject$(allFormats[1]),
_links: {
self: 'bitstream-selflink',
format: 'format-link',
},
bundle: createSuccessfulRemoteDataObject$({
_links: {
Expand Down Expand Up @@ -605,7 +609,7 @@ describe('EditBitstreamPageComponent', () => {
format: createSuccessfulRemoteDataObject$(allFormats[2]),
_links: {
self: 'bitstream-selflink',
},
format: 'format-link' },
bundle: createSuccessfulRemoteDataObject$({
_links: {
primaryBitstream: {
Expand Down
Loading
Loading