Skip to content

Commit d449108

Browse files
atarix83atarix83
committed
[CST-9636] revert changes to object-list.component
1 parent 16ff75c commit d449108

4 files changed

Lines changed: 41 additions & 62 deletions

File tree

‎src/app/access-control/bulk-access/browse/bulk-access-browse.component.html‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,30 @@
3434
{{'admin.access-control.bulk-access-browse.selected.header' | translate: {number: ((objectsSelected$ | async)?.payload?.totalElements) ? (objectsSelected$ | async)?.payload?.totalElements : '0'} }}
3535
</a>
3636
<ng-template ngbNavContent>
37-
<ds-themed-object-list [config]="paginationOptions$ | async"
38-
[hideGear]="true"
39-
[listToPaginate]="true"
40-
[objects]="objectsSelected$ | async"
41-
[selectable]="true"
42-
[selectionConfig]="{ repeatable: true, listId: listId }"
43-
[showThumbnails]="false"
44-
[showPaginator]="false"
45-
(next)="pageNext()"
46-
(prev)="pagePrev()"></ds-themed-object-list>
37+
<ds-pagination
38+
[paginationOptions]="(paginationOptions$ | async)"
39+
[pageInfoState]="(objectsSelected$|async)?.payload.pageInfo"
40+
[collectionSize]="(objectsSelected$|async)?.payload?.totalElements"
41+
[objects]="(objectsSelected$|async)"
42+
[showPaginator]="false"
43+
(prev)="pagePrev()"
44+
(next)="pageNext()">
45+
<ul *ngIf="(objectsSelected$|async)?.hasSucceeded" class="list-unstyled ml-4">
46+
<li *ngFor='let object of (objectsSelected$|async)?.payload?.page | paginate: { itemsPerPage: (paginationOptions$ | async).pageSize,
47+
currentPage: (paginationOptions$ | async).currentPage, totalItems: (objectsSelected$|async)?.payload?.page.length }; let i = index; let last = last '
48+
class="mt-4 mb-4 d-flex"
49+
[attr.data-test]="'list-object' | dsBrowserOnly">
50+
<ds-selectable-list-item-control [index]="i"
51+
[object]="object"
52+
[selectionConfig]="{ repeatable: true, listId: listId }"></ds-selectable-list-item-control>
53+
<ds-listable-object-component-loader [listID]="listId"
54+
[index]="i"
55+
[object]="object"
56+
[showThumbnails]="false"
57+
[viewMode]="'list'"></ds-listable-object-component-loader>
58+
</li>
59+
</ul>
60+
</ds-pagination>
4761
</ng-template>
4862
</li>
4963
</ul>

‎src/app/shared/object-list/object-list.component.html‎

Lines changed: 17 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -16,46 +16,22 @@
1616
(prev)="goPrev()"
1717
(next)="goNext()">
1818
<ul *ngIf="objects?.hasSucceeded" class="list-unstyled" [ngClass]="{'ml-4': selectable}">
19-
<ng-container *ngIf="listToPaginate">
20-
<li *ngFor='let object of objects?.payload?.page | paginate: { itemsPerPage: config.pageSize,
21-
currentPage: config.currentPage, totalItems: objects?.payload?.page.length }; let i = index; let last = last ' class="mt-4 mb-4 d-flex" [class.border-bottom]="hasBorder && !last" [attr.data-test]="'list-object' | dsBrowserOnly">
22-
<ds-selectable-list-item-control *ngIf="selectable" [index]="i"
23-
[object]="object"
24-
[selectionConfig]="selectionConfig"
25-
(deselectObject)="deselectObject.emit($event)"
26-
(selectObject)="selectObject.emit($event)"></ds-selectable-list-item-control>
27-
<ds-importable-list-item-control *ngIf="importable" [object]="object"
28-
[importConfig]="importConfig"
29-
(importObject)="importObject.emit($event)"></ds-importable-list-item-control>
30-
<ds-listable-object-component-loader [context]="context"
31-
[linkType]="linkType"
32-
[listID]="selectionConfig?.listId"
33-
[index]="i"
34-
[object]="object"
35-
[showThumbnails]="showThumbnails"
36-
[viewMode]="viewMode"
37-
(contentChange)="contentChange.emit($event)"></ds-listable-object-component-loader>
38-
</li>
39-
</ng-container>
40-
<ng-container *ngIf="!listToPaginate">
41-
<li *ngFor="let object of objects?.payload?.page; let i = index; let last = last" class="mt-4 mb-4 d-flex" [class.border-bottom]="hasBorder && !last" [attr.data-test]="'list-object' | dsBrowserOnly">
42-
<ds-selectable-list-item-control *ngIf="selectable" [index]="i"
43-
[object]="object"
44-
[selectionConfig]="selectionConfig"
45-
(deselectObject)="deselectObject.emit($event)"
46-
(selectObject)="selectObject.emit($event)"></ds-selectable-list-item-control>
47-
<ds-importable-list-item-control *ngIf="importable" [object]="object"
48-
[importConfig]="importConfig"
49-
(importObject)="importObject.emit($event)"></ds-importable-list-item-control>
50-
<ds-listable-object-component-loader [context]="context"
51-
[linkType]="linkType"
52-
[listID]="selectionConfig?.listId"
53-
[index]="i"
54-
[object]="object"
55-
[showThumbnails]="showThumbnails"
56-
[viewMode]="viewMode"
57-
(contentChange)="contentChange.emit($event)"></ds-listable-object-component-loader>
58-
</li>
59-
</ng-container>
19+
<li *ngFor="let object of objects?.payload?.page; let i = index; let last = last" class="mt-4 mb-4 d-flex" [class.border-bottom]="hasBorder && !last" [attr.data-test]="'list-object' | dsBrowserOnly">
20+
<ds-selectable-list-item-control *ngIf="selectable" [index]="i"
21+
[object]="object"
22+
[selectionConfig]="selectionConfig"
23+
(deselectObject)="deselectObject.emit($event)"
24+
(selectObject)="selectObject.emit($event)"></ds-selectable-list-item-control>
25+
<ds-importable-list-item-control *ngIf="importable" [object]="object"
26+
[importConfig]="importConfig"
27+
(importObject)="importObject.emit($event)"></ds-importable-list-item-control>
28+
<ds-listable-object-component-loader [object]="object"
29+
[viewMode]="viewMode"
30+
[index]="i"
31+
[context]="context"
32+
[linkType]="linkType"
33+
[listID]="selectionConfig?.listId"
34+
(contentChange)="contentChange.emit($event)"></ds-listable-object-component-loader>
35+
</li>
6036
</ul>
6137
</ds-pagination>

‎src/app/shared/object-list/object-list.component.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,6 @@ export class ObjectListComponent {
7676
*/
7777
@Input() importConfig: { buttonLabel: string };
7878

79-
/**
80-
* If true the object list provided needs to be paginated using the `paginate` pipe
81-
*/
82-
@Input() listToPaginate = false;
83-
8479
/**
8580
* Whether or not the pagination should be rendered as simple previous and next buttons instead of the normal pagination
8681
*/

‎src/app/shared/object-list/themed-object-list.component.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,6 @@ export class ThemedObjectListComponent extends ThemedComponent<ObjectListCompone
4444
*/
4545
@Input() hidePagerWhenSinglePage: boolean;
4646

47-
/**
48-
* If true the object list provided needs to be paginated using the `paginate` pipe
49-
*/
50-
@Input() listToPaginate: boolean;
51-
5247
@Input() selectable: boolean;
5348

5449
@Input() selectionConfig: { repeatable: boolean, listId: string };
@@ -165,7 +160,6 @@ export class ThemedObjectListComponent extends ThemedComponent<ObjectListCompone
165160
'hidePaginationDetail',
166161
'importable',
167162
'importConfig',
168-
'listToPaginate',
169163
'showPaginator',
170164
'showThumbnails',
171165
'contentChange',

0 commit comments

Comments
 (0)