Skip to content

Commit

Permalink
[frontend] confidence fix (#6837-additional-fix)
Browse files Browse the repository at this point in the history
  • Loading branch information
SarahBocognano committed May 2, 2024
1 parent 8e3cb8c commit 9af5093
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import useAuth from './useAuth';
import { MESSAGING$ } from '../../relay/environment';
import { useFormatter } from '../../components/i18n';
import { isNotEmptyField } from '../utils';

const useConfidenceLevel = () => {
const { me } = useAuth();
Expand All @@ -13,7 +14,7 @@ const useConfidenceLevel = () => {
return userEffectiveConfidenceLevel?.max_confidence ?? 0;
}
const override = overrides.find((n) => n.entity_type === entityType);
if (override) {
if (override && isNotEmptyField(userEffectiveConfidenceLevel?.max_confidence)) {
return override.max_confidence;
}
return userEffectiveConfidenceLevel?.max_confidence ?? 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@ export const computeUserEffectiveConfidenceLevel = (user: AuthUser) => {
const overrides = Array.from(overridesMap.entries())
.map(([key, value]) => ({ entity_type: key, max_confidence: value }));

if (isEmptyField(maxLevel) && overrides.length === 0) {
if (isEmptyField(maxLevel)) {
return null;
}

return {
max_confidence: isNotEmptyField(maxLevel) ? cropNumber(maxLevel as number, 0, 100) : null,
max_confidence: cropNumber(maxLevel as number, 0, 100),
overrides,
source,
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,14 +177,7 @@ describe('Confidence level utilities', () => {
groups: [groupNull, groupNull],
capabilities: []
};
expect(computeUserEffectiveConfidenceLevel(userK as unknown as AuthUser)).toEqual({
max_confidence: null,
source: null,
overrides: [
{ entity_type: 'Report', max_confidence: 50 },
{ entity_type: 'Malware', max_confidence: 35 }
],
});
expect(computeUserEffectiveConfidenceLevel(userK as unknown as AuthUser)).toEqual(null);
});
});

Expand Down

0 comments on commit 9af5093

Please sign in to comment.