Skip to content

Affiliate improvements fixes #254

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
JulienVannier66 merged 6 commits into from
Sep 5, 2025
Merged

Affiliate improvements fixes #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a1fbbe2
Fix inconsistent column filters behavior when removing values
JulienVannier66 Sep 2, 2025
4719466
PR feedback - fix wording
JulienVannier66 Sep 3, 2025
1ec0dc1
Merge pull request #251 from upfluence/jv/vel-6150/inconsistent-colum…
JulienVannier66 Sep 4, 2025
33ed397
Add events when apply range filters
JulienVannier66 Sep 3, 2025
c1b5259
Merge pull request #253 from upfluence/jv/vel-6162/sales-value-filter…
JulienVannier66 Sep 4, 2025
e02a495
Add FilterUpdateIntentStatus type for filterUpdateIntent event
JulienVannier66 Sep 4, 2025
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
23 changes: 15 additions & 8 deletions addon/components/hyper-table-v2/filtering-renderers/numeric.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ interface HyperTableV2FilteringRenderersNumericArgs {
column: Column;
}

export type FilterUpdateIntentStatus = 'pending' | 'fulfilled' | 'rejected';

const RANGE_DEBOUNCE_TIME = 500;
const DEFAULT_MULTIPLIER = 1;

Expand Down Expand Up @@ -77,6 +79,7 @@ export default class HyperTableV2FilteringRenderersNumeric extends Component<Hyp
@action
addRangeFilter(): void {
debounce(this, this._addRangeFilter, isTesting() ? 0 : RANGE_DEBOUNCE_TIME);
this.args.handler.triggerEvent('filterUpdateIntent', this.args.column, 'pending');
}

@action
Expand All @@ -91,14 +94,18 @@ export default class HyperTableV2FilteringRenderersNumeric extends Component<Hyp
}

private _addRangeFilter(): void {
this.args.handler.applyFilters(this.args.column, [
...(this.lowerBoundFilter
? [{ key: 'lower_bound', value: (parseInt(this.lowerBoundFilter) * this.multiplier).toString() }]
: []),
...(this.upperBoundFilter
? [{ key: 'upper_bound', value: (parseInt(this.upperBoundFilter) * this.multiplier).toString() }]
: [])
]);
this.args.handler
.applyFilters(this.args.column, [
...(this.lowerBoundFilter
? [{ key: 'lower_bound', value: (parseInt(this.lowerBoundFilter) * this.multiplier).toString() }]
: []),
...(this.upperBoundFilter
? [{ key: 'upper_bound', value: (parseInt(this.upperBoundFilter) * this.multiplier).toString() }]
: []),
...(this.lowerBoundFilter || this.upperBoundFilter ? [{ key: 'existence', value: 'with' }] : [])
])
.then(() => this.args.handler.triggerEvent('filterUpdateIntent', this.args.column, 'fulfilled'))
.catch(() => this.args.handler.triggerEvent('filterUpdateIntent', this.args.column, 'rejected'));
}

private initLowerBound(): void {
Expand Down
25 changes: 14 additions & 11 deletions addon/core/handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,17 +265,20 @@ export default class TableHandler {
column,
'filters',
filters
.reduce((acc, v) => {
const filterWithSameKey = acc.find((filter) => filter.key === v.key);

if (filterWithSameKey) {
filterWithSameKey.value = v.value;
} else {
acc.push(v);
}

return acc;
}, column.filters)
.reduce(
(acc, v) => {
const filterWithSameKey = acc.find((filter) => filter.key === v.key);

if (filterWithSameKey) {
filterWithSameKey.value = v.value;
} else {
acc.push(v);
}

return acc;
},
column.filters.filter((f) => filters.find((nf) => nf.key === f.key))
)
.filter((f) => !isEmpty(f.key) && !isEmpty(f.value))
);

Expand Down
10 changes: 8 additions & 2 deletions tests/integration/components/hyper-table-v2/filtering-renderers/numeric-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,12 @@ module('Integration | Component | hyper-table-v2/filtering-renderers/numeric', f
//@ts-ignore
{ code: 'Enter' }
);
assert.ok(handlerSpy.applyFilters.calledWith(this.column, [{ key: 'lower_bound', value: '1' }]));
assert.ok(
handlerSpy.applyFilters.calledWith(this.column, [
{ key: 'lower_bound', value: '1' },
{ key: 'existence', value: 'with' }
])
);

await fillIn('[data-control-name="hypertable__column_filtering_for_total_range_to"]', '9');
await triggerKeyEvent(
Expand All @@ -196,7 +201,8 @@ module('Integration | Component | hyper-table-v2/filtering-renderers/numeric', f
assert.ok(
handlerSpy.applyFilters.calledWith(this.column, [
{ key: 'lower_bound', value: '1' },
{ key: 'upper_bound', value: '9' }
{ key: 'upper_bound', value: '9' },
{ key: 'existence', value: 'with' }
])
);
});
Expand Down
12 changes: 12 additions & 0 deletions tests/unit/core/handler-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,18 @@ module('Unit | core/handler', function (hooks) {
{ key: 'fizz', value: 'buzz' }
]);
});

test('removed filters are cleared', function (this: TestContext, assert: Assert) {
this.handler.columns[0].filters = [
{ key: 'foo', value: 'bar' },
{ key: 'fizz', value: 'buzz' }
];

this.handler.applyFilters(this.handler.columns[0], [{ key: 'fizz', value: 'buzz' }]);

assert.equal(this.handler.columns[0].filters.length, 1);
assert.deepEqual(this.handler.columns[0].filters, [{ key: 'fizz', value: 'buzz' }]);
});
});

module('Handler#resetColumns', function () {
Expand Down