IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue where the cloud deployment wizard creates the cluster with the

Browse Source 
High Availability even if that option is not selected. Fixes #7608
This commit is contained in:
Khushboo Vashi
2022-08-14 07:14:10 +05:30
committed by Akshay Joshi
parent 1e94c3bd81
commit ae5254e8a9
11 changed files with 66 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
web/pgadmin/misc/cloud/static/js/biganimal.js
View File

@@ -188,6 +188,7 @@ export function getBigAnimalSummary(cloud, bigAnimalInstanceData, bigAnimalDatab
createData('Database Type', bigAnimalDatabaseData.database_type),
createData('Database Version', bigAnimalDatabaseData.postgres_version),
createData('High Availability', bigAnimalDatabaseData.high_availability),
createData('No of Standby Replicas', bigAnimalDatabaseData.replicas),
];
return [rows1, rows2, rows3, rows4];
@@ -211,6 +212,10 @@ export function validateBigAnimalStep3(cloudDBDetails, nodeInfo) {
isEmptyString(cloudDBDetails.database_type) || isEmptyString(cloudDBDetails.postgres_version)) {
isError = true;
}
if(cloudDBDetails.high_availability == true && (isEmptyString(cloudDBDetails.replicas) || cloudDBDetails.replicas <= 0)) {
isError = true;
}
if (isEmptyString(cloudDBDetails.gid)) cloudDBDetails.gid = nodeInfo['server_group']._id;
return isError;
}

31
web/pgadmin/misc/cloud/static/js/cloud_db_details_schema.ui.js
View File

@@ -467,6 +467,7 @@ class BigAnimalDatabaseSchema extends BaseUISchema {
database_type: '',
postgres_version: '',
high_availability: false,
replicas: 0,
...initValues
});
@@ -487,7 +488,10 @@ class BigAnimalDatabaseSchema extends BaseUISchema {
setErrMsg('confirm_password', gettext('Password must be 12 characters or more.'));
return true;
}
if (data.high_availability == true && (isEmptyString(data.replicas) || data.replicas <= 0)) {
setErrMsg('replicas', gettext('Please select no. of stand by replicas.'));
return true;
}
return false;
}
@@ -592,6 +596,7 @@ class BigAnimalHighAvailSchema extends BaseUISchema {
super({
oid: undefined,
high_availability: false,
replicas: 0,
...initValues
});
@@ -610,13 +615,25 @@ class BigAnimalHighAvailSchema extends BaseUISchema {
{
id: 'high_availability_note', type: 'note',
mode: ['create'],
text: gettext('High availability clusters are configured with one primary and two '
+ 'replicas with synchronous streaming replication. Clusters are configured across availability zones in regions with availability zones.'),
text: gettext('High availability clusters are configured with one primary and up to two '
+ 'stand by replicas. Clusters are configured across availability zones in regions with availability zones.'),
},{
id: 'high_availability', label: gettext('High Availability'), type: 'switch',
mode: ['create'],
helpMessage: gettext('Turning on high availability means your number of CPUs will triple, as will your cost.'),
}
id: 'high_availability', label: gettext('High availability'), type: 'switch',
mode: ['create']
},{
id: 'replicas', label: gettext('Number of standby replicas'), type: 'select',
mode: ['create'], deps: ['high_availability'],
controlProps: { allowClear: false },
helpMessage: gettext('Adding standby replicas will increase your number of CPUs, as well as your cost.'),
options: [
{'label': gettext('1'), 'value': 1},
{'label': gettext('2'), 'value': 2},
], noEmpty: true,
disabled: (state) => {
if (state.high_availability == true) return false;
return true;
}
},
];
}
}