Skip to content
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

Add equals/not equals string criteria #917

Merged
merged 2 commits into from
Nov 2, 2020
+21 −42
Merged

Add equals/not equals string criteria #917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66efad8
Fix encoding of string criteria
WithoutPants Nov 2, 2020
8e729ec
Add equals and includes (and not) string criteria
WithoutPants Nov 2, 2020
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
22 changes: 15 additions & 7 deletions pkg/models/querybuilder_sql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,20 +60,28 @@ func (qb *queryBuilder) handleIntCriterionInput(c *IntCriterionInput, column str

func (qb *queryBuilder) handleStringCriterionInput(c *StringCriterionInput, column string) {
if c != nil {
if modifier := c.Modifier.String(); c.Modifier.IsValid() {
if modifier := c.Modifier; c.Modifier.IsValid() {
switch modifier {
case "EQUALS":
case CriterionModifierIncludes:
clause, thisArgs := getSearchBinding([]string{column}, c.Value, false)
qb.addWhere(clause)
qb.addArg(thisArgs...)
case "NOT_EQUALS":
case CriterionModifierExcludes:
clause, thisArgs := getSearchBinding([]string{column}, c.Value, true)
qb.addWhere(clause)
qb.addArg(thisArgs...)
case "IS_NULL":
qb.addWhere(column + " IS NULL")
case "NOT_NULL":
qb.addWhere(column + " IS NOT NULL")
case CriterionModifierEquals:
qb.addWhere(column + " LIKE ?")
qb.addArg(c.Value)
case CriterionModifierNotEquals:
qb.addWhere(column + " NOT LIKE ?")
qb.addArg(c.Value)
default:
clause, count := getSimpleCriterionClause(modifier, "?")
qb.addWhere(column + " " + clause)
if count == 1 {
qb.addArg(c.Value)
}
}
}
}
Expand Down
32 changes: 2 additions & 30 deletions ui/v2.5/src/models/list-filter/criteria/criterion.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,8 @@ export class StringCriterion extends Criterion {
public modifierOptions = [
StringCriterion.getModifierOption(CriterionModifier.Equals),
StringCriterion.getModifierOption(CriterionModifier.NotEquals),
StringCriterion.getModifierOption(CriterionModifier.Includes),
StringCriterion.getModifierOption(CriterionModifier.Excludes),
StringCriterion.getModifierOption(CriterionModifier.IsNull),
StringCriterion.getModifierOption(CriterionModifier.NotNull),
];
Expand All @@ -273,36 +275,6 @@ export class StringCriterion extends Criterion {
this.parameterName = type;
}
}

public static getModifierOption(
modifier: CriterionModifier = CriterionModifier.Equals
): ILabeledValue {
switch (modifier) {
case CriterionModifier.Equals:
return { value: CriterionModifier.Equals, label: "Includes" };
case CriterionModifier.NotEquals:
return { value: CriterionModifier.NotEquals, label: "Excludes" };
default:
return super.getModifierOption(modifier);
}
}

public getLabel(): string {
let modifierString: string;
switch (this.modifier) {
case CriterionModifier.Equals:
modifierString = "includes";
break;
case CriterionModifier.NotEquals:
modifierString = "excludes";
break;
default:
return super.getLabel();
}

const valueString = this.getLabelValue();
return `${Criterion.getLabel(this.type)} ${modifierString} ${valueString}`;
}
}

export class MandatoryStringCriterion extends StringCriterion {
Expand Down
5 changes: 1 addition & 4 deletions ui/v2.5/src/models/list-filter/filter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,10 +329,7 @@ export class ListFilterModel {
}

jsonParameters.forEach((jsonString) => {
// make sure we escape \
const escaped = jsonString.replaceAll("\\", "\\\\");

const encodedCriterion = JSON.parse(escaped);
const encodedCriterion = JSON.parse(jsonString);
const criterion = makeCriteria(encodedCriterion.type);
// it's possible that we have unsupported criteria. Just skip if so.
if (criterion) {
Expand Down
4 changes: 3 additions & 1 deletion ui/v2.5/src/models/list-filter/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ export interface ILabeledValue {
}

export function encodeILabeledId(o: ILabeledId) {
return { ...o, label: encodeURIComponent(o.label) };
// escape \ to \\ so that it encodes to JSON correctly
const adjustedLabel = o.label.replaceAll("\\", "\\\\");
return { ...o, label: encodeURIComponent(adjustedLabel) };
}

export interface IOptionType {
Expand Down