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

Jump to bottom

[frontend] fix filter priority order #1534

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

[frontend] fix filter priority order #1534

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cd751bf
[frontend] fix filter order priority
savacano28 Sep 25, 2024
6b85973
[frontend] fix operator for enumerated types
savacano28 Sep 27, 2024
cbc4dc8
[backend] fix null pointer
savacano28 Sep 27, 2024
046634b
[backend] fix query empty values for enumerated types
savacano28 Sep 27, 2024
7ad43fd
[backend] wip
savacano28 Sep 27, 2024
f0a8a86
[backend] wip
savacano28 Sep 27, 2024
a3d5652
[backend] add filter empty/no empty to enumerated types
savacano28 Sep 27, 2024
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
11 changes: 9 additions & 2 deletions openbas-api/src/main/java/io/openbas/service/AtomicTestingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,8 +436,15 @@
// Inject has a command payload
Payload payload = injectorContract.getPayload();
Command payloadCommand = (Command) Hibernate.unproxy(payload);
return new InjectStatusCommandLine(!payloadCommand.getContent().isBlank() ? List.of(payloadCommand.getContent()) : null,
!payloadCommand.getCleanupCommand().isBlank() ? List.of(payload.getCleanupCommand()) : null, payload.getExternalId());
return new InjectStatusCommandLine(

Check warning on line 439 in openbas-api/src/main/java/io/openbas/service/AtomicTestingService.java

View check run for this annotation

Codecov / codecov/patch

openbas-api/src/main/java/io/openbas/service/AtomicTestingService.java#L439 

Added line #L439 was not covered by tests
payloadCommand.getContent() != null && !payloadCommand.getContent().isBlank()
? List.of(payloadCommand.getContent())
: null,

Check warning on line 442 in openbas-api/src/main/java/io/openbas/service/AtomicTestingService.java

View check run for this annotation

Codecov / codecov/patch

openbas-api/src/main/java/io/openbas/service/AtomicTestingService.java#L441-L442 

Added lines #L441 - L442 were not covered by tests
payloadCommand.getCleanupCommand() != null && !payloadCommand.getCleanupCommand().isBlank()
? List.of(payloadCommand.getCleanupCommand())
: null,
payload.getExternalId()

Check warning on line 446 in openbas-api/src/main/java/io/openbas/service/AtomicTestingService.java

View check run for this annotation

Codecov / codecov/patch

openbas-api/src/main/java/io/openbas/service/AtomicTestingService.java#L444-L446 

Added lines #L444 - L446 were not covered by tests
);
} else {
// Inject comes from Caldera ability and tomorrow from other(s) Executor(s)
io.openbas.execution.Injector executor = context.getBean(injectorContract.getInjector().getType(), io.openbas.execution.Injector.class);
Expand Down
8 changes: 4 additions & 4 deletions openbas-front/src/components/common/queryable/filter/FilterUtils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,6 @@ export const availableOperators = (propertySchema: PropertySchemaDTO) => {
if (propertySchema.schema_property_type.includes('instant')) {
return ['gt', 'gte', 'lt', 'lte', 'empty', 'not_empty'];
}
// Array
if (propertySchema.schema_property_type_array || propertySchema.schema_property_values) {
return ['contains', 'not_contains', 'empty', 'not_empty'];
}
// Enum & not array
if (propertySchema.schema_property_values && !propertySchema.schema_property_type_array) {
return ['eq'];
Expand All @@ -103,6 +99,10 @@ export const availableOperators = (propertySchema: PropertySchemaDTO) => {
if (propertySchema.schema_property_has_dynamic_value && !propertySchema.schema_property_type_array) {
return ['contains', 'not_contains', 'empty', 'not_empty'];
}
// Array
if (propertySchema.schema_property_type_array) {
return ['contains', 'not_contains', 'empty', 'not_empty'];
}
return [
'eq',
'not_eq',
Expand Down