Skip to content

Commit b1eda74

Browse files
authored
Merge pull request #232 from balena-io-modules/reordering-with-default-columns
Experiment: Allow column reordering with `reducedDefaultDeviceColumnsAndReordering` feature flag
2 parents 20b0a21 + 7cd55b8 commit b1eda74

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

src/components/RJST/components/Table/TableActions.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@ const SortableItem = <T extends object>({
4242
{...attributes}
4343
sx={{ transform: CSS.Transform.toString(transform), transition }}
4444
>
45-
{analyticsState.featureFlags?.columnOrdering && (
45+
{(analyticsState.featureFlags
46+
? analyticsState.featureFlags.columnOrdering ||
47+
analyticsState.featureFlags.reducedDefaultDeviceColumnsAndReordering
48+
: false) && (
4649
<ListItemIcon
4750
{...listeners}
4851
sx={{
@@ -127,7 +130,8 @@ export const TableActions = <T extends object>({
127130
!active ||
128131
!over ||
129132
!onColumnPreferencesChange ||
130-
!analyticsState.featureFlags?.columnOrdering
133+
(!analyticsState.featureFlags?.columnOrdering &&
134+
!analyticsState.featureFlags?.reducedDefaultDeviceColumnsAndReordering)
131135
) {
132136
return;
133137
}

0 commit comments

Comments
 (0)