Skip to content

IBX-9916: Fixed subitems headers #1563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 26, 2025
Merged

IBX-9916: Fixed subitems headers #1563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions ...bundle/ui-dev/src/modules/sub-items/components/sub-items-list/sub.items.list.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const SubItemsListComponent = ({
sortClause,
sortOrder,
languageContainerSelector,
columnsVisibility,
}) => {
const Component = getViewComponent(activeView);

Expand All @@ -34,6 +35,7 @@ const SubItemsListComponent = ({
sortClause={sortClause}
sortOrder={sortOrder}
languageContainerSelector={languageContainerSelector}
columnsVisibility={columnsVisibility}
/>
);
};
Expand All @@ -52,6 +54,7 @@ SubItemsListComponent.propTypes = {
sortClause: PropTypes.string.isRequired,
sortOrder: PropTypes.string.isRequired,
languageContainerSelector: PropTypes.string.isRequired,
columnsVisibility: PropTypes.object.isRequired,
};

export default SubItemsListComponent;
26 changes: 21 additions & 5 deletions src/bundle/ui-dev/src/modules/sub-items/sub.items.module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,7 +1225,7 @@ export default class SubItemsModule extends Component {

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

return this.renderActionBtnWrapper(<ActionButton disabled={disabled} onClick={this.onMoveBtnClick} label={label} type="move" />);
return this.renderActionBtnWrapper(
<ActionButton disabled={disabled} onClick={this.onMoveBtnClick} label={label} type="move" />,
'',
{ key: 'bulk-move-btn' },
);
}

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

return this.renderActionBtnWrapper(
<ActionButton disabled={disabled} onClick={this.onAddLocationsBtnClick} label={label} type="create-location" />,
'',
{ key: 'bulk-add-locations-btn' },
);
}

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

return this.renderActionBtnWrapper(<ActionButton disabled={disabled} onClick={this.onHideBtnClick} label={label} type="hide" />);
return this.renderActionBtnWrapper(
<ActionButton disabled={disabled} onClick={this.onHideBtnClick} label={label} type="hide" />,
'',
{ key: 'bulk-hide-btn' },
);
}

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

return this.renderActionBtnWrapper(
<ActionButton disabled={disabled} onClick={this.onUnhideBtnClick} label={label} type="reveal" />,
'',
{ key: 'bulk-unhide-btn' },
);
}

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

return this.renderActionBtnWrapper(<ActionButton disabled={disabled} onClick={this.onDeleteBtnClick} label={label} type="trash" />);
return this.renderActionBtnWrapper(
<ActionButton disabled={disabled} onClick={this.onDeleteBtnClick} label={label} type="trash" />,
'',
{ key: 'bulk-delete-btn' },
);
}

renderSpinner() {
Expand Down Expand Up @@ -1429,7 +1445,7 @@ export default class SubItemsModule extends Component {
this.renderActionBtnWrapper(
<ActionButton disabled={false} onClick={this.showMorePanel} type="options" />,
'ibexa-adaptive-items__item--selector',
{ ref: this._refAdaptiveItemMoreBtn },
{ ref: this._refAdaptiveItemMoreBtn, key: 'more-btn' },
),
ReactDOM.createPortal(
<div className={panelClasses} ref={this._refAdaptiveItemMorePanel}>
Expand Down
Loading