Skip to content

MON-1896 [Monitor form aggregation] #19

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

Merged
lironhamra merged 2 commits into from
Apr 19, 2023
Merged

MON-1896 [Monitor form aggregation] #19

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25f3d0e
MON-1896 [Monitor form aggregation]
lironhamra Apr 19, 2023
fd64ef4
Merge branch 'main' into liron/mon-1896-re-add-aggregation-window-too…
lironhamra Apr 19, 2023
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
27 changes: 17 additions & 10 deletions frontend/src/components/Dashboard/MonitorDrawer/components/MonitorForm/MonitorForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ import useModels from 'helpers/hooks/useModels';
import { TextField, Stack, MenuItem, OutlinedInput, Typography } from '@mui/material';

import { MarkedSelect } from 'components/MarkedSelect';
import { ControlledMarkedSelect, ControlledMarkedSelectDisabledCallback } from 'components/MarkedSelect/ControlledMarkedSelect';
import {
ControlledMarkedSelect,
ControlledMarkedSelectDisabledCallback
} from 'components/MarkedSelect/ControlledMarkedSelect';
import { SelectCheck as Check } from 'components/SelectCheck';
import { SelectColumn as Column } from 'components/SelectColumn';
import { TooltipInputWrapper } from 'components/TooltipInputWrapper';
Expand Down Expand Up @@ -226,19 +229,22 @@ export const MonitorForm = ({
setColumn('');
};

const isDisabledLookback = useCallback((lookbackSelect: { label: string; value: number }) => {
if (frequency === undefined) return false;
if (lookbackSelect.value < frequency ) return true;
if (lookbackSelect.value > +frequency * 31 ) return true;
return false;
}, [frequency]);
const isDisabledLookback = useCallback(
(lookbackSelect: { label: string; value: number }) => {
if (frequency === undefined) return false;
if (lookbackSelect.value < +frequency) return true;
if (lookbackSelect.value > +frequency * 31) return true;
return false;
},
[frequency]
);

useEffect(() => {
const filteredLookbacks = lookbackTimeWindow.filter(val => !isDisabledLookback(val)).map(val => val.value);
if (lookBack && !filteredLookbacks.includes(+lookBack)) {
setLookBack(filteredLookbacks.at(-1));
}
}, [frequency])
}, [frequency]);

useEffect(() => {
if (isDrawerOpen) {
Expand Down Expand Up @@ -270,8 +276,8 @@ export const MonitorForm = ({
]);

const aggregationWindowErr = aggregationWindow > 30;
const aggregationWindowSuffix = `${FrequencyNumberMap[frequency as FrequencyNumberType['type']]}${
aggregationWindow > 1 ? 'S' : ''
const aggregationWindowSuffix = `${FrequencyNumberMap[frequency as FrequencyNumberType['type']].toLowerCase()}${
aggregationWindow > 1 ? 's' : ''
}`;

return (
Expand Down Expand Up @@ -361,6 +367,7 @@ export const MonitorForm = ({
</StyledLink>
) : (
<Subcategory sx={{ marginTop: '0 !important' }}>
<Typography sx={{ color: 'gray' }}>Aggregation value</Typography>
<OutlinedInput
placeholder="Aggregation window"
size="small"
Expand Down