[frontend] Change default filter mode

Author: RomuDeuxfois

openbas-front/src/components/common/queryable/filter/FilterChipValues.tsx

@@ -54,15 +54,15 @@ const FilterChipValues: FunctionComponent<Props> = ({
     }
   }, [filter]);
 
-  const or = (
+  const i18nMode = (mode: Filter['mode']) => (
     <div className={classes.mode}>
-      {t('OR')}
+      {t(mode === 'and' ? 'AND' : 'OR')}
     </div>
   );
 
-  const toValues = (opts: Option[]) => opts.map((o, idx) => (
+  const toValues = (opts: Option[], mode: Filter['mode']) => opts.map((o, idx) => (
     <Fragment key={o.id}>
-      {idx > 0 && or}
+      {idx > 0 && i18nMode(mode)}
       <span>
         {' '}
         {propertySchema?.schema_property_type.includes('instant') || !o.label ? (o.label) : t(o.label)}
@@ -121,7 +121,7 @@ const FilterChipValues: FunctionComponent<Props> = ({
           overflow: 'hidden',
         }}
         >
-          {toValues(options)}
+          {toValues(options, filter.mode)}
         </Box>
       </span>
     )

openbas-front/src/components/common/queryable/filter/FilterUtils.tsx

@@ -3,14 +3,14 @@ import * as R from 'ramda';
 import { type Filter, type FilterGroup, type PropertySchemaDTO } from '../../../../utils/api-types';
 
 export const emptyFilterGroup: FilterGroup = {
-  mode: 'and',
+  mode: 'or',
   filters: [],
 };
 
 export const buildEmptyFilter = (key: string, operator: Filter['operator']) => {
   return {
     key,
-    mode: 'and' as Filter['mode'],
+    mode: 'or' as Filter['mode'],
     values: [],
     operator,
   };
@@ -19,7 +19,7 @@ export const buildEmptyFilter = (key: string, operator: Filter['operator']) => {
 export const buildFilter = (key: string, values: string[], operator: Filter['operator']) => {
   return {
     key,
-    mode: 'and' as Filter['mode'],
+    mode: 'or' as Filter['mode'],
     values,
     operator,
   };