Skip to content

Fixed field reset for memory & cpu fields in new tenant size screen #1593

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
merged 2 commits into from
Feb 17, 2022
Merged

Fixed field reset for memory & cpu fields in new tenant size screen #1593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20fe177
Fixed field reset for memory & cpu fields in new tenant size screen
Feb 17, 2022
f78f5ef
Merge branch 'master' into fixed-cpu-memory-reset
bexsoft Feb 17, 2022
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
6 changes: 3 additions & 3 deletions portal-ui/src/screens/Console/Tenants/AddTenant/AddTenant.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import {
wizardCommon,
} from "../../Common/FormComponents/common/styleLibrary";
import api from "../../../../common/api";
import { generatePoolName } from "../../../../common/utils";
import { generatePoolName, getBytes } from "../../../../common/utils";
import GenericWizard from "../../Common/GenericWizard/GenericWizard";
import { IWizardElement } from "../../Common/GenericWizard/types";
import { NewServiceAccount } from "../../Common/CredentialsPrompt/types";
Expand Down Expand Up @@ -280,7 +280,7 @@ const AddTenant = ({
}
if (fields.tenantSize.resourcesMemoryRequest !== "") {
dataSend.pools[0].resources.requests.memory = parseInt(
fields.tenantSize.resourcesMemoryRequest
getBytes(fields.tenantSize.resourcesMemoryRequest, "Gi", true)
);
}
}
Expand All @@ -297,7 +297,7 @@ const AddTenant = ({
}
if (fields.tenantSize.resourcesMemoryLimit !== "") {
dataSend.pools[0].resources.limits.memory = parseInt(
fields.tenantSize.resourcesMemoryLimit
getBytes(fields.tenantSize.resourcesMemoryLimit, "Gi", true)
);
}
}
Expand Down
14 changes: 2 additions & 12 deletions portal-ui/src/screens/Console/Tenants/AddTenant/Steps/SizePreview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,21 +74,11 @@ const styles = (theme: Theme) =>

const SizePreview = ({
classes,
updateAddField,
isPageValid,
volumeSize,
sizeFactor,
drivesPerServer,
nodes,
memoryNode,
ecParity,
ecParityChoices,
cleanECChoices,
resourcesSize,
distribution,
ecParityCalc,
limitSize,
selectedStorageClass,
cpuToUse,
integrationSelection,
}: ISizePreviewProps) => {
Expand Down Expand Up @@ -253,7 +243,7 @@ const mapState = (state: AppState) => ({
sizeFactor: state.tenants.createTenant.fields.tenantSize.sizeFactor,
drivesPerServer: state.tenants.createTenant.fields.tenantSize.drivesPerServer,
nodes: state.tenants.createTenant.fields.tenantSize.nodes,
memoryNode: state.tenants.createTenant.fields.tenantSize.memoryNode,
memoryNode: state.tenants.createTenant.fields.tenantSize.resourcesMemoryRequest,
ecParity: state.tenants.createTenant.fields.tenantSize.ecParity,
ecParityChoices: state.tenants.createTenant.fields.tenantSize.ecParityChoices,
cleanECChoices: state.tenants.createTenant.fields.tenantSize.cleanECChoices,
Expand All @@ -263,7 +253,7 @@ const mapState = (state: AppState) => ({
limitSize: state.tenants.createTenant.fields.tenantSize.limitSize,
selectedStorageClass:
state.tenants.createTenant.fields.nameTenant.selectedStorageClass,
cpuToUse: state.tenants.createTenant.fields.tenantSize.cpuToUse,
cpuToUse: state.tenants.createTenant.fields.tenantSize.resourcesCPURequest,
integrationSelection:
state.tenants.createTenant.fields.tenantSize.integrationSelection,
});
Expand Down
9 changes: 7 additions & 2 deletions ...al-ui/src/screens/Console/Tenants/AddTenant/Steps/TenantResources/TenantSizeResources.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,14 +176,19 @@ const TenantSizeResources = ({
);

const baseCpuUse = Math.max(1, floor(maxAllocatableCPU / 2));
updateField("resourcesCPURequest", baseCpuUse);
if (resourcesCPURequest === "") {
updateField("resourcesCPURequest", baseCpuUse);
}

const baseMemoryUse = Math.max(2, floor(maxMemory / 2));
updateField("resourcesMemoryRequest", baseMemoryUse);
if (resourcesMemoryRequest === "") {
updateField("resourcesMemoryRequest", baseMemoryUse);
}
})
.catch((err: any) => {
updateField("maxMemorySize", 0);
updateField("resourcesCPURequest", "");
updateField("resourcesMemoryRequest", "");

console.error(err);
});
Expand Down