fix(striker-ui): add basic validation workflow

main
Tsu-ba-me 3 years ago
parent 3c866ddfa0
commit 559679f8a3
  1. 143
      striker-ui/components/ProvisionServerDialog.tsx

@ -23,6 +23,7 @@ import {
import Autocomplete from './Autocomplete'; import Autocomplete from './Autocomplete';
import ContainedButton, { ContainedButtonProps } from './ContainedButton'; import ContainedButton, { ContainedButtonProps } from './ContainedButton';
import MenuItem from './MenuItem'; import MenuItem from './MenuItem';
import MessageBox from './MessageBox';
import OutlinedInput from './OutlinedInput'; import OutlinedInput from './OutlinedInput';
import OutlinedInputLabel from './OutlinedInputLabel'; import OutlinedInputLabel from './OutlinedInputLabel';
import OutlinedInputWithLabel, { import OutlinedInputWithLabel, {
@ -165,7 +166,13 @@ type UpdateLimitsFunction = (options?: {
memory?: bigint; memory?: bigint;
storageGroupUUIDMapToFree?: StorageGroupUUIDMapToFree; storageGroupUUIDMapToFree?: StorageGroupUUIDMapToFree;
virtualDisks?: VirtualDiskStates; virtualDisks?: VirtualDiskStates;
}) => void; }) => Partial<ReturnType<FilterAnvilsFunction>>;
type TestArgs = {
max: bigint | number;
min: bigint | number;
value: bigint | number;
};
const MOCK_DATA = { const MOCK_DATA = {
anvils: [ anvils: [
@ -404,7 +411,6 @@ const createOutlinedSlider = (
value: number, value: number,
sliderProps?: Partial<SliderProps>, sliderProps?: Partial<SliderProps>,
): JSX.Element => ( ): JSX.Element => (
<FormControl>
<Slider <Slider
// eslint-disable-next-line react/jsx-props-no-spreading // eslint-disable-next-line react/jsx-props-no-spreading
{...{ {...{
@ -415,7 +421,6 @@ const createOutlinedSlider = (
...sliderProps, ...sliderProps,
}} }}
/> />
</FormControl>
); );
const createOutlinedInputWithSelect = ( const createOutlinedInputWithSelect = (
@ -423,14 +428,17 @@ const createOutlinedInputWithSelect = (
label: string, label: string,
selectItems: SelectItem[], selectItems: SelectItem[],
{ {
error,
inputWithLabelProps, inputWithLabelProps,
selectProps, selectProps,
}: { }: {
error?: string;
inputWithLabelProps?: Partial<OutlinedInputWithLabelProps>; inputWithLabelProps?: Partial<OutlinedInputWithLabelProps>;
selectProps?: Partial<SelectProps>; selectProps?: Partial<SelectProps>;
} = {}, } = {},
) => ( ) => (
<FormControl <Box>
<Box
sx={{ sx={{
display: 'flex', display: 'flex',
flexDirection: 'row', flexDirection: 'row',
@ -451,7 +459,11 @@ const createOutlinedInputWithSelect = (
{createOutlinedSelect(`${id}-nested-select`, undefined, selectItems, { {createOutlinedSelect(`${id}-nested-select`, undefined, selectItems, {
selectProps, selectProps,
})} })}
</FormControl> </Box>
{error && (
<MessageBox sx={{ marginTop: '.4em' }} type="error" text={error} />
)}
</Box>
); );
const createMaxValueButton = ( const createMaxValueButton = (
@ -1024,6 +1036,8 @@ const filterBlanks: (array: string[]) => string[] = (array: string[]) =>
const ProvisionServerDialog = ({ const ProvisionServerDialog = ({
dialogProps: { open }, dialogProps: { open },
}: ProvisionServerDialogProps): JSX.Element => { }: ProvisionServerDialogProps): JSX.Element => {
const inputCPUCoresMin = 1;
const [allAnvils, setAllAnvils] = useState< const [allAnvils, setAllAnvils] = useState<
OrganizedAnvilDetailMetadataForProvisionServer[] OrganizedAnvilDetailMetadataForProvisionServer[]
>([]); >([]);
@ -1041,9 +1055,15 @@ const ProvisionServerDialog = ({
const [inputCPUCoresValue, setInputCPUCoresValue] = useState<number>(1); const [inputCPUCoresValue, setInputCPUCoresValue] = useState<number>(1);
const [inputCPUCoresMax, setInputCPUCoresMax] = useState<number>(0); const [inputCPUCoresMax, setInputCPUCoresMax] = useState<number>(0);
const [inputCPUCoresError, setInputCPUCoresError] = useState<
string | undefined
>();
const [memory, setMemory] = useState<bigint>(BIGINT_ZERO); const [memory, setMemory] = useState<bigint>(BIGINT_ZERO);
const [memoryMax, setMemoryMax] = useState<bigint>(BIGINT_ZERO); const [memoryMax, setMemoryMax] = useState<bigint>(BIGINT_ZERO);
const [inputMemoryError, setInputMemoryError] = useState<
string | undefined
>();
const [inputMemoryMax, setInputMemoryMax] = useState<string>('0'); const [inputMemoryMax, setInputMemoryMax] = useState<string>('0');
const [inputMemoryValue, setInputMemoryValue] = useState<string>(''); const [inputMemoryValue, setInputMemoryValue] = useState<string>('');
const [inputMemoryUnit, setInputMemoryUnit] = useState<DataSizeUnit>('B'); const [inputMemoryUnit, setInputMemoryUnit] = useState<DataSizeUnit>('B');
@ -1128,20 +1148,121 @@ const ProvisionServerDialog = ({
}, },
toUnit: ulInputMemoryUnit, toUnit: ulInputMemoryUnit,
}); });
return {
maxCPUCores,
maxMemory,
};
}; };
// The memorized version of updateLimits() should only be called during first render. // The memorized version of updateLimits() should only be called during first render.
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
const initLimits = useCallback(updateLimits, []); const initLimits = useCallback(updateLimits, []);
const testInput = (inputs: { [id: string]: Partial<TestArgs> }): boolean => {
const testMax = ({ max, min }: TestArgs) => max >= min;
const testRange = ({ max, min, value }: TestArgs) =>
value >= min && value <= max;
const tests: {
[id: string]: {
defaults: TestArgs & {
onSuccess: () => void;
};
tests: Array<{
onFailure?: () => void;
onSuccess?: () => void;
test: (args: TestArgs) => boolean;
}>;
};
} = {
cpuCores: {
defaults: {
max: inputCPUCoresMax,
min: inputCPUCoresMin,
onSuccess: () => {
setInputCPUCoresError('');
},
value: inputCPUCoresValue,
},
tests: [
{
onFailure: () => {
setInputCPUCoresError('Non available.');
},
test: testMax,
},
{
onFailure: () => {
setInputCPUCoresError('Out of range.');
},
test: testRange,
},
],
},
memory: {
defaults: {
max: memoryMax,
min: 1,
onSuccess: () => {
setInputMemoryError('');
},
value: memory,
},
tests: [
{
onFailure: () => {
setInputMemoryError('Non available.');
},
test: testMax,
},
{
onFailure: () => {
setInputMemoryError('Out of range.');
},
test: testRange,
},
],
},
};
return Object.keys(inputs).every((id: string) => {
const {
defaults: {
max: dMax,
min: dMin,
onSuccess: dOnSuccess,
value: dValue,
},
tests: group,
} = tests[id];
const { max = dMax, min = dMin, value = dValue } = inputs[id];
return group.every(({ onFailure, onSuccess = dOnSuccess, test }) => {
const result: boolean = test({ max, min, value });
if (result) {
onSuccess?.call(null);
} else {
onFailure?.call(null);
}
return result;
});
});
};
const changeMemory = ({ const changeMemory = ({
cmValue = BIGINT_ZERO, cmValue = BIGINT_ZERO,
cmUnit = inputMemoryUnit, cmUnit = inputMemoryUnit,
}: { cmValue?: bigint; cmUnit?: DataSizeUnit } = {}) => { }: { cmValue?: bigint; cmUnit?: DataSizeUnit } = {}) => {
setMemory(cmValue); setMemory(cmValue);
updateLimits({
const { maxMemory } = updateLimits({
inputMemoryUnit: cmUnit, inputMemoryUnit: cmUnit,
memory: cmValue, memory: cmValue,
}); });
testInput({ memory: { max: maxMemory, value: cmValue } });
}; };
const handleInputMemoryValueChange = ({ const handleInputMemoryValueChange = ({
@ -1257,6 +1378,7 @@ const ProvisionServerDialog = ({
> >
<OutlinedInputWithLabel id="ps-server-name" label="Server name" /> <OutlinedInputWithLabel id="ps-server-name" label="Server name" />
{createOutlinedSlider('ps-cpu-cores', 'CPU cores', inputCPUCoresValue, { {createOutlinedSlider('ps-cpu-cores', 'CPU cores', inputCPUCoresValue, {
error: inputCPUCoresError,
sliderProps: { sliderProps: {
onChange: (value) => { onChange: (value) => {
const newCPUCoresValue = value as number; const newCPUCoresValue = value as number;
@ -1264,13 +1386,17 @@ const ProvisionServerDialog = ({
if (newCPUCoresValue !== inputCPUCoresValue) { if (newCPUCoresValue !== inputCPUCoresValue) {
setInputCPUCoresValue(newCPUCoresValue); setInputCPUCoresValue(newCPUCoresValue);
updateLimits({ const { maxCPUCores: newCPUCoresMax } = updateLimits({
cpuCores: newCPUCoresValue, cpuCores: newCPUCoresValue,
}); });
testInput({
cpuCores: { max: newCPUCoresMax, value: newCPUCoresValue },
});
} }
}, },
max: inputCPUCoresMax, max: inputCPUCoresMax,
min: 1, min: inputCPUCoresMin,
}, },
})} })}
<BodyText <BodyText
@ -1281,6 +1407,7 @@ const ProvisionServerDialog = ({
'Memory', 'Memory',
DATA_SIZE_UNIT_SELECT_ITEMS, DATA_SIZE_UNIT_SELECT_ITEMS,
{ {
error: inputMemoryError,
inputWithLabelProps: { inputWithLabelProps: {
inputProps: { inputProps: {
endAdornment: createMaxValueButton( endAdornment: createMaxValueButton(

Loading…
Cancel
Save