Skip to content

Commit 405aa51

Browse files
authored
IBX-7415: [Subitems] As a User I want to see columns dependant on focus mode (#1069)
1 parent 519b526 commit 405aa51

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

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

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
22
import ReactDOM from 'react-dom';
33
import PropTypes from 'prop-types';
44

5+
import { getAdminUiConfig } from '@ibexa-admin-ui/src/bundle/Resources/public/js/scripts/helpers/context.helper';
56
import ViewColumnsTogglerComponent from './components/view-columns-toggler/view.columns.toggler';
67
import ViewSwitcherComponent from './components/view-switcher/view.switcher.component.js';
78
import SubItemsListComponent from './components/sub-items-list/sub.items.list.component.js';
@@ -97,6 +98,7 @@ export default class SubItemsModule extends Component {
9798
this._refMainContainerWrapper = React.createRef();
9899
this.bulkActionModalContainer = null;
99100
this.udwContainer = null;
101+
this.adminUiConfig = getAdminUiConfig();
100102

101103
const sortClauseData = this.getDefaultSortClause(props.sortClauses);
102104

@@ -1255,7 +1257,7 @@ export default class SubItemsModule extends Component {
12551257
onSortChange={this.changeSorting}
12561258
sortClause={sortClause}
12571259
sortOrder={sortOrder}
1258-
columnsVisibility={this.filterSmartModeColumns(columnsVisibility)}
1260+
columnsVisibility={this.filterColumnsVisibility(columnsVisibility)}
12591261
languageContainerSelector={this.props.languageContainerSelector}
12601262
/>
12611263
);
@@ -1271,14 +1273,20 @@ export default class SubItemsModule extends Component {
12711273
);
12721274
}
12731275

1274-
filterSmartModeColumns(allColumns) {
1275-
// TODO: filter when smart mode implemented
1276-
const expertModeColumns = ['section', 'location-id', 'location-remote-id', 'object-id', 'object-remote-id'];
1276+
getColumnsToFilterOut() {
1277+
if (this.adminUiConfig.focusMode) {
1278+
return ['section', 'location-id', 'location-remote-id', 'object-id', 'object-remote-id'];
1279+
}
1280+
1281+
return [];
1282+
}
12771283

1284+
filterColumnsVisibility(allColumns) {
1285+
const columnsToFilterOut = this.getColumnsToFilterOut();
12781286
const filteredColumns = {};
12791287

12801288
Object.keys(allColumns).forEach((columnKey) => {
1281-
if (!expertModeColumns.includes(columnKey)) {
1289+
if (!columnsToFilterOut.includes(columnKey)) {
12821290
filteredColumns[columnKey] = allColumns[columnKey];
12831291
}
12841292
});
@@ -1358,7 +1366,7 @@ export default class SubItemsModule extends Component {
13581366
{this.renderBulkUnhideBtn(bulkUnhideBtnDisabled)}
13591367
{this.renderBulkDeleteBtn(bulkBtnDisabled)}
13601368
<ViewColumnsTogglerComponent
1361-
columnsVisibility={this.filterSmartModeColumns(columnsVisibility)}
1369+
columnsVisibility={this.filterColumnsVisibility(columnsVisibility)}
13621370
toggleColumnVisibility={this.toggleColumnVisibility}
13631371
isDisabled={activeView === VIEW_MODE_GRID}
13641372
/>

0 commit comments

Comments
 (0)