Skip to content

Commit a4cc83e

Browse files
FrancescoMolinaroAndrea Barbasso
authored andcommitted
Merged in task/dspace-cris-2024_02_x/DSC-2941 (pull request DSpace#4886)
[DSC-2941] move cris layout properties from map to components, add tests Approved-by: Andrea Barbasso
2 parents 6ffbb20 + cf84623 commit a4cc83e

34 files changed

Lines changed: 324 additions & 66 deletions

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ import { CrisLayoutBoxModelComponent } from '../../../../models/cris-layout-box-
5757
})
5858
export class CrisLayoutCollectionBoxComponent extends CrisLayoutBoxModelComponent implements OnInit {
5959

60+
static hasOwnContainer = false;
61+
6062
isInline = environment.crisLayout.collectionsBox.isInline;
6163

6264
/**

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/iiif-viewer/cris-layout-iiif-viewer-box.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ import { CrisLayoutBoxModelComponent } from '../../../../models/cris-layout-box-
2424
})
2525
export class CrisLayoutIIIFViewerBoxComponent extends CrisLayoutBoxModelComponent implements OnInit {
2626

27+
static hasOwnContainer = false;
28+
2729
isSearchable: boolean;
2830
query$: Observable<string>;
2931

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/cris-layout-metadata-box.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ import { RowComponent } from './row/row.component';
3434
*/
3535
export class CrisLayoutMetadataBoxComponent extends CrisLayoutBoxModelComponent implements OnInit, OnDestroy {
3636

37+
static hasOwnContainer = false;
38+
3739
/**
3840
* Contains the fields configuration for current box
3941
*/

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ import { BitstreamAttachmentComponent } from './bitstream-attachment/bitstream-a
4949
*/
5050
export class AdvancedAttachmentComponent extends AttachmentComponent implements OnInit {
5151

52+
static structured = true;
53+
5254
/**
5355
* Environment variables configuring the fields to be viewed
5456
*/

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/attachment/attachment.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ import { BitstreamAttachmentRenderingModelComponent } from './bitstream-attachme
5454
*/
5555
export class AttachmentComponent extends BitstreamAttachmentRenderingModelComponent implements OnInit {
5656

57+
static structured = true;
58+
5759
/**
5860
* List of bitstreams to show
5961
*/

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-large/cc-license-large.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ import { MetadataGroupComponent } from '../metadataGroup/metadata-group.componen
1919
})
2020
export class CcLicenseLargeComponent extends MetadataGroupComponent implements OnInit {
2121

22+
static structured = false;
23+
2224
dcRights: any;
2325
dcRightsUri: any;
2426

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-small/cc-license-small.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ import { MetadataGroupComponent } from '../metadataGroup/metadata-group.componen
1919
})
2020
export class CcLicenseSmallComponent extends MetadataGroupComponent implements OnInit {
2121

22+
static structured = false;
23+
2224
dcRights: any;
2325
dcRightsUri: any;
2426

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/crisref/crisref.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,6 @@ import { RenderingTypeValueModelComponent } from '../rendering-type-value.model'
1616
})
1717
export class CrisrefComponent extends RenderingTypeValueModelComponent {
1818

19+
static structured = false;
20+
1921
}

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/date/date.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,6 @@ import { RenderingTypeValueModelComponent } from '../rendering-type-value.model'
1616
})
1717
export class DateComponent extends RenderingTypeValueModelComponent {
1818

19+
static structured = false;
20+
1921
}

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/heading/heading.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@ import { RenderingTypeValueModelComponent } from '../rendering-type-value.model'
1515
})
1616
export class HeadingComponent extends RenderingTypeValueModelComponent {
1717

18+
static structured = false;
19+
1820
}

0 commit comments

Comments
 (0)