Skip to content

Commit b33e42c

Browse files
committed
Revert changes
1 parent 7f56d13 commit b33e42c

File tree

4 files changed

+5
-59
lines changed

4 files changed

+5
-59
lines changed

frontend/src/__tests__/cypress/cypress/pages/modelServing.ts

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -456,26 +456,6 @@ class ServingRuntimeModal extends Modal {
456456
return this.find().findByTestId('model-server-size-selection');
457457
}
458458

459-
findModelServerSizeSelectOption(name: string) {
460-
return cy.findByTestId(`model-server-size-select-option-${name}`);
461-
}
462-
463-
findCPURequestInput() {
464-
return this.find().findByTestId('cpu-request-input');
465-
}
466-
467-
findCPULimitInput() {
468-
return this.find().findByTestId('cpu-limit-input');
469-
}
470-
471-
findMemoryRequestInput() {
472-
return this.find().findByTestId('memory-request-input');
473-
}
474-
475-
findMemoryLimitInput() {
476-
return this.find().findByTestId('memory-limit-input');
477-
}
478-
479459
findDeployedModelRouteCheckbox() {
480460
return this.find().findByTestId('alt-form-checkbox-route');
481461
}

frontend/src/__tests__/cypress/cypress/tests/mocked/modelServing/runtime/servingRuntimeList.cy.ts

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -896,25 +896,6 @@ describe('Serving Runtime List', () => {
896896
kserveModal.findServingRuntimeEnvVarsValue('0').type('test-value');
897897
kserveModal.findSubmitButton().should('be.enabled');
898898

899-
// test model server size select
900-
kserveModal.findModelServerSizeSelect().click();
901-
kserveModal.findModelServerSizeSelectOption('Medium').find('button').click();
902-
kserveModal.findSubmitButton().should('be.enabled');
903-
kserveModal.findModelServerSizeSelect().click();
904-
kserveModal.findModelServerSizeSelectOption('Custom').find('button').click();
905-
kserveModal.findSubmitButton().should('be.enabled');
906-
907-
// test custom cpu and memory
908-
kserveModal.findCPURequestInput().clear().type('3');
909-
kserveModal.findCPULimitInput().clear().type('2');
910-
kserveModal.findMemoryRequestInput().clear().type('4Gi');
911-
kserveModal.findMemoryLimitInput().clear().type('3Gi');
912-
kserveModal.findSubmitButton().should('be.disabled');
913-
914-
kserveModal.findModelServerSizeSelect().click();
915-
kserveModal.findModelServerSizeSelectOption('Small').find('button').click();
916-
kserveModal.findSubmitButton().should('be.enabled');
917-
918899
// test submitting form, the modal should close to indicate success.
919900
kserveModal.findSubmitButton().click();
920901
kserveModal.shouldBeOpen(false);

frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/ServingRuntimeSizeExpandedField.tsx

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,45 +32,31 @@ const ServingRuntimeSizeExpandedField = ({
3232
},
3333
});
3434
};
35-
const setInitialValue = (
36-
type: ContainerResourceAttributes,
37-
variant: ResourceKeys,
38-
): string | number => {
39-
if (data.resources[variant]?.[type] === undefined) {
40-
handleChange(type, variant, '1');
41-
return '1';
42-
}
43-
return data.resources[variant][type];
44-
};
4535

4636
return (
4737
<Grid hasGutter md={6}>
4838
<FormGroup label="CPUs requested">
4939
<CPUField
5040
onChange={(value) => handleChange(ContainerResourceAttributes.CPU, 'requests', value)}
51-
value={setInitialValue(ContainerResourceAttributes.CPU, 'requests')}
52-
dataTestId="cpu-request"
41+
value={data.resources.requests?.cpu}
5342
/>
5443
</FormGroup>
5544
<FormGroup label="Memory requested">
5645
<MemoryField
5746
onChange={(value) => handleChange(ContainerResourceAttributes.MEMORY, 'requests', value)}
58-
value={setInitialValue(ContainerResourceAttributes.MEMORY, 'requests')}
59-
dataTestId="memory-request"
47+
value={data.resources.requests?.memory}
6048
/>
6149
</FormGroup>
6250
<FormGroup label="CPU limit">
6351
<CPUField
6452
onChange={(value) => handleChange(ContainerResourceAttributes.CPU, 'limits', value)}
65-
value={setInitialValue(ContainerResourceAttributes.CPU, 'limits')}
66-
dataTestId="cpu-limit"
53+
value={data.resources.limits?.cpu}
6754
/>
6855
</FormGroup>
6956
<FormGroup label="Memory limit">
7057
<MemoryField
7158
onChange={(value) => handleChange(ContainerResourceAttributes.MEMORY, 'limits', value)}
72-
value={setInitialValue(ContainerResourceAttributes.MEMORY, 'limits')}
73-
dataTestId="memory-limit"
59+
value={data.resources.limits?.memory}
7460
/>
7561
</FormGroup>
7662
</Grid>

frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/ServingRuntimeSizeSection.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,14 @@ const ServingRuntimeSizeSection = ({
5353
const sizeOptions = () =>
5454
sizeCustom.map((size) => {
5555
const { name } = size;
56-
const dataTestId = `model-server-size-select-option-${name}`;
5756
const desc =
5857
name !== 'Custom'
5958
? `Limits: ${size.resources.limits?.cpu || '??'} CPU, ` +
6059
`${formatMemory(size.resources.limits?.memory) || '??'} Memory ` +
6160
`Requests: ${size.resources.requests?.cpu || '??'} CPU, ` +
6261
`${formatMemory(size.resources.requests?.memory) || '??'} Memory`
6362
: '';
64-
return { key: name, label: name, description: desc, dataTestId };
63+
return { key: name, label: name, description: desc };
6564
});
6665

6766
const isHardwareProfileSupported = React.useCallback(

0 commit comments

Comments
 (0)