Skip to content

Commit ecfa52c

Browse files
authored
IBX-9916: Fixed subitems headers (#1563)
1 parent d655077 commit ecfa52c

File tree

2 files changed

+24
-5
lines changed

2 files changed

+24
-5
lines changed

src/bundle/ui-dev/src/modules/sub-items/components/sub-items-list/sub.items.list.component.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ const SubItemsListComponent = ({
1616
sortClause,
1717
sortOrder,
1818
languageContainerSelector,
19+
columnsVisibility,
1920
}) => {
2021
const Component = getViewComponent(activeView);
2122

@@ -34,6 +35,7 @@ const SubItemsListComponent = ({
3435
sortClause={sortClause}
3536
sortOrder={sortOrder}
3637
languageContainerSelector={languageContainerSelector}
38+
columnsVisibility={columnsVisibility}
3739
/>
3840
);
3941
};
@@ -52,6 +54,7 @@ SubItemsListComponent.propTypes = {
5254
sortClause: PropTypes.string.isRequired,
5355
sortOrder: PropTypes.string.isRequired,
5456
languageContainerSelector: PropTypes.string.isRequired,
57+
columnsVisibility: PropTypes.object.isRequired,
5558
};
5659

5760
export default SubItemsListComponent;

src/bundle/ui-dev/src/modules/sub-items/sub.items.module.js

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1225,7 +1225,7 @@ export default class SubItemsModule extends Component {
12251225

12261226
renderActionBtnWrapper(btn, extraClasses = '', extraProps = {}) {
12271227
return (
1228-
<div className={`ibexa-adaptive-items__item ${extraClasses}`} {...extraProps}>
1228+
<div className={`ibexa-adaptive-items__item ${extraClasses}`} {...extraProps} key={extraProps.key}>
12291229
{btn}
12301230
</div>
12311231
);
@@ -1234,35 +1234,51 @@ export default class SubItemsModule extends Component {
12341234
renderBulkMoveBtn(disabled) {
12351235
const label = Translator.trans(/*@Desc("Move")*/ 'move_btn.label', {}, 'ibexa_sub_items');
12361236

1237-
return this.renderActionBtnWrapper(<ActionButton disabled={disabled} onClick={this.onMoveBtnClick} label={label} type="move" />);
1237+
return this.renderActionBtnWrapper(
1238+
<ActionButton disabled={disabled} onClick={this.onMoveBtnClick} label={label} type="move" />,
1239+
'',
1240+
{ key: 'bulk-move-btn' },
1241+
);
12381242
}
12391243

12401244
renderBulkAddLocationBtn(disabled) {
12411245
const label = Translator.trans(/*@Desc("Add Locations")*/ 'add_locations_btn.label', {}, 'ibexa_sub_items');
12421246

12431247
return this.renderActionBtnWrapper(
12441248
<ActionButton disabled={disabled} onClick={this.onAddLocationsBtnClick} label={label} type="create-location" />,
1249+
'',
1250+
{ key: 'bulk-add-locations-btn' },
12451251
);
12461252
}
12471253

12481254
renderBulkHideBtn(disabled) {
12491255
const label = Translator.trans(/*@Desc("Hide")*/ 'hide_locations_btn.label', {}, 'ibexa_sub_items');
12501256

1251-
return this.renderActionBtnWrapper(<ActionButton disabled={disabled} onClick={this.onHideBtnClick} label={label} type="hide" />);
1257+
return this.renderActionBtnWrapper(
1258+
<ActionButton disabled={disabled} onClick={this.onHideBtnClick} label={label} type="hide" />,
1259+
'',
1260+
{ key: 'bulk-hide-btn' },
1261+
);
12521262
}
12531263

12541264
renderBulkUnhideBtn(disabled) {
12551265
const label = Translator.trans(/*@Desc("Reveal")*/ 'unhide_locations_btn.label', {}, 'ibexa_sub_items');
12561266

12571267
return this.renderActionBtnWrapper(
12581268
<ActionButton disabled={disabled} onClick={this.onUnhideBtnClick} label={label} type="reveal" />,
1269+
'',
1270+
{ key: 'bulk-unhide-btn' },
12591271
);
12601272
}
12611273

12621274
renderBulkDeleteBtn(disabled) {
12631275
const label = Translator.trans(/*@Desc("Delete")*/ 'trash_btn.label', {}, 'ibexa_sub_items');
12641276

1265-
return this.renderActionBtnWrapper(<ActionButton disabled={disabled} onClick={this.onDeleteBtnClick} label={label} type="trash" />);
1277+
return this.renderActionBtnWrapper(
1278+
<ActionButton disabled={disabled} onClick={this.onDeleteBtnClick} label={label} type="trash" />,
1279+
'',
1280+
{ key: 'bulk-delete-btn' },
1281+
);
12661282
}
12671283

12681284
renderSpinner() {
@@ -1429,7 +1445,7 @@ export default class SubItemsModule extends Component {
14291445
this.renderActionBtnWrapper(
14301446
<ActionButton disabled={false} onClick={this.showMorePanel} type="options" />,
14311447
'ibexa-adaptive-items__item--selector',
1432-
{ ref: this._refAdaptiveItemMoreBtn },
1448+
{ ref: this._refAdaptiveItemMoreBtn, key: 'more-btn' },
14331449
),
14341450
ReactDOM.createPortal(
14351451
<div className={panelClasses} ref={this._refAdaptiveItemMorePanel}>

0 commit comments

Comments
 (0)