refactor: improve filters and conditions section in dataset dashboard #1927
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
Hey @abdimo101 - I've reviewed your changes and they look great!
Prompt for AI Agents
Please address the comments from this code review:
## Individual Comments
### Comment 1
<location> `src/app/datasets/datasets-filter/datasets-filter.component.ts:212` </location>
<code_context>
+ return `${condition.lhs}-${index}`;
+ }
+
+ getConditionDisplayText(condition: any): string {
+ if (!condition.lhs || !condition.rhs) return "Configure condition...";
+
+ let relationSymbol = "";
+ switch (condition.relation) {
+ case "EQUAL_TO_NUMERIC":
+ case "EQUAL_TO_STRING":
+ relationSymbol = "=";
+ break;
+ case "LESS_THAN":
+ relationSymbol = "<";
+ break;
+ case "GREATER_THAN":
+ relationSymbol = ">";
+ break;
+ default:
+ relationSymbol = "";
+ }
+
+ const rhsValue =
+ condition.relation === "EQUAL_TO_STRING"
+ ? `"${condition.rhs}"`
+ : condition.rhs;
+
+ const unit = condition.unit ? ` ${condition.unit}` : "";
+ return `${relationSymbol} ${rhsValue}${unit}`;
+ }
+
</code_context>
<issue_to_address>
getConditionDisplayText may not handle all possible relation types.
If new relation types are added, they will default to an empty symbol, which may be unclear. Please handle all relation types explicitly or provide a clearer fallback.
</issue_to_address>
<suggested_fix>
<<<<<<< SEARCH
getConditionDisplayText(condition: any): string {
if (!condition.lhs || !condition.rhs) return "Configure condition...";
let relationSymbol = "";
switch (condition.relation) {
case "EQUAL_TO_NUMERIC":
case "EQUAL_TO_STRING":
relationSymbol = "=";
break;
case "LESS_THAN":
relationSymbol = "<";
break;
case "GREATER_THAN":
relationSymbol = ">";
break;
default:
relationSymbol = "";
}
const rhsValue =
condition.relation === "EQUAL_TO_STRING"
? `"${condition.rhs}"`
: condition.rhs;
const unit = condition.unit ? ` ${condition.unit}` : "";
return `${relationSymbol} ${rhsValue}${unit}`;
}
=======
getConditionDisplayText(condition: any): string {
if (!condition.lhs || !condition.rhs) return "Configure condition...";
let relationSymbol: string;
switch (condition.relation) {
case "EQUAL_TO_NUMERIC":
case "EQUAL_TO_STRING":
relationSymbol = "=";
break;
case "LESS_THAN":
relationSymbol = "<";
break;
case "GREATER_THAN":
relationSymbol = ">";
break;
case "NOT_EQUAL_TO_NUMERIC":
case "NOT_EQUAL_TO_STRING":
relationSymbol = "≠";
break;
case "LESS_THAN_OR_EQUAL":
relationSymbol = "≤";
break;
case "GREATER_THAN_OR_EQUAL":
relationSymbol = "≥";
break;
// Add more known relation types here as needed
default:
// Fallback: show the relation name in a readable way
relationSymbol = condition.relation
? `[${condition.relation.replace(/_/g, " ").toLowerCase()}]`
: "?";
}
const rhsValue =
condition.relation === "EQUAL_TO_STRING" || condition.relation === "NOT_EQUAL_TO_STRING"
? `"${condition.rhs}"`
: condition.rhs;
const unit = condition.unit ? ` ${condition.unit}` : "";
return `${relationSymbol} ${rhsValue}${unit}`;
}
>>>>>>> REPLACE
</suggested_fix>
### Comment 2
<location> `src/app/datasets/datasets-filter/datasets-filter.component.ts:379` </location>
<code_context>
+ this.updateConditionInStore(updatedConditions);
+ }
+
+ updateConditionOperator(index: number, newOperator: string) {
+ this.updateCondition(index, {
+ relation: newOperator as any,
+ unit: newOperator === "EQUAL_TO_STRING" ? "" : undefined,
</code_context>
<issue_to_address>
Setting unit to empty string for EQUAL_TO_STRING may cause inconsistencies.
Storing unit as an empty string may differ from omitting it or setting it to undefined. Normalize the unit field to undefined or remove it when not needed.
</issue_to_address>
<suggested_fix>
<<<<<<< SEARCH
updateConditionOperator(index: number, newOperator: string) {
this.updateCondition(index, {
relation: newOperator as any,
unit: newOperator === "EQUAL_TO_STRING" ? "" : undefined,
});
}
=======
updateConditionOperator(index: number, newOperator: string) {
const update: any = { relation: newOperator as any };
if (newOperator !== "EQUAL_TO_STRING") {
update.unit = undefined;
}
this.updateCondition(index, update);
}
>>>>>>> REPLACE
</suggested_fix>
### Comment 3
<location> `src/app/datasets/datasets-filter/datasets-filter.component.ts:386` </location>
<code_context>
+ });
+ }
+
+ updateConditionValue(index: number, event: Event) {
+ const newValue = (event.target as HTMLInputElement).value;
+ this.updateCondition(index, { rhs: newValue });
+ }
+
</code_context>
<issue_to_address>
No type conversion is performed for numeric values in updateConditionValue.
If numeric conditions require a number, convert the input value accordingly before updating.
Suggested implementation:
```typescript
updateConditionValue(index: number, event: Event) {
const inputValue = (event.target as HTMLInputElement).value;
// Assuming you have a conditions array and each condition has a 'type' property
const condition = this.conditions[index];
let newValue: any = inputValue;
if (condition && condition.type === 'number') {
const parsed = Number(inputValue);
newValue = isNaN(parsed) ? inputValue : parsed;
}
this.updateCondition(index, { rhs: newValue });
}
```
- If your condition type property is named something other than `type`, or if you determine numeric conditions differently, adjust the check accordingly.
- Make sure `this.conditions` is accessible in this context. If not, use the appropriate way to access the condition metadata for the given index.
</issue_to_address>Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
Comment on lines
+386
to
+388
| updateConditionValue(index: number, event: Event) { | ||
| const newValue = (event.target as HTMLInputElement).value; | ||
| this.updateCondition(index, { rhs: newValue }); |
There was a problem hiding this comment.
suggestion: No type conversion is performed for numeric values in updateConditionValue.
If numeric conditions require a number, convert the input value accordingly before updating.
Suggested implementation:
updateConditionValue(index: number, event: Event) {
const inputValue = (event.target as HTMLInputElement).value;
// Assuming you have a conditions array and each condition has a 'type' property
const condition = this.conditions[index];
let newValue: any = inputValue;
if (condition && condition.type === 'number') {
const parsed = Number(inputValue);
newValue = isNaN(parsed) ? inputValue : parsed;
}
this.updateCondition(index, { rhs: newValue });
}- If your condition type property is named something other than
type, or if you determine numeric conditions differently, adjust the check accordingly. - Make sure
this.conditionsis accessible in this context. If not, use the appropriate way to access the condition metadata for the given index.
Junjiequan
force-pushed
the
datasets-filter-conditions
branch
from
5206918 to
390fa21
Compare
…/frontend into datasets-filter-conditions
Junjiequan
reviewed
Jul 8, 2025
| return `${condition.lhs}-${index}`; | ||
| } | ||
|
|
||
| getConditionDisplayText(condition: any): string { |
|
|
||
| updateConditionOperator(index: number, newOperator: string) { | ||
| this.updateCondition(index, { | ||
| relation: newOperator as any, |
There was a problem hiding this comment.
why as any here? arent relations fixed values
There was a problem hiding this comment.
It was a quick fix for a type error, but it's working without it now so it's no longer necessary
|
Can you also include a test that checks pre-configured scientific metadata filter applies automatically on startup. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Motivation
Background on use case, changes needed
Fixes:
Please provide a list of the fixes implemented in this PR
Changes:
Please provide a list of the changes implemented by this PR
Tests included
Documentation
official documentation info
If you have updated the official documentation, please provide PR # and URL of the pages where the updates are included
Backend version
Summary by Sourcery
Refactor the dataset dashboard’s filter section to manage scientific conditions directly within the main panel using Material expansion panels, refresh UI styling and layout, clean up old dialog code, and update tests accordingly
Enhancements:
Build:
Tests:
Chores: