Skip to content
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

Jump to bottom

[#8620] [Platform] [Backport-2.6] Reset the values on cancel. #8626

Merged
merged 3 commits into from
May 27, 2021
Merged

[#8620] [Platform] [Backport-2.6] Reset the values on cancel. #8626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa058a2
[#8620] Platform: Reset the values in cancel.
nishantSharma459 May 26, 2021
4ab0e06
[#8620] Platform: minor changes.
nishantSharma459 May 26, 2021
6383c5d
[#8620] Platform: Set the iamRoleEnabled value on edit.
nishantSharma459 May 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 5 additions & 12 deletions managed/ui/src/components/config/Storage/AwsStorageConfiguration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,6 @@ import YBInfoTip from '../../common/descriptors/YBInfoTip';
const required = (value) => value ? undefined : 'This field is required.';

class AwsStorageConfiguration extends Component {
state = {
iamRoleEnabled: false
};

iamInstanceToggle = (event) => {
this.setState({ iamRoleEnabled: event.target.checked });
};

disabledInputFields = (config, isEdited, iamRoleEnabled = false) => {
if (
((!isEmptyObject(config) && isEdited) || (isEmptyObject(config) && !isEdited)) &&
Expand Down Expand Up @@ -49,9 +41,10 @@ class AwsStorageConfiguration extends Component {
deleteStorageConfig,
showDeleteStorageConfig,
enableEdit,
onEditConfig
onEditConfig,
iamRoleEnabled,
iamInstanceToggle
} = this.props;
const { iamRoleEnabled } = this.state;
const s3Config = customerConfigs.data.find((config) => config.name === 'S3');
const config = s3Config ? s3Config.data : {};

Expand All @@ -66,7 +59,7 @@ class AwsStorageConfiguration extends Component {
<Field
name="IAM_INSTANCE_PROFILE"
component={YBToggle}
onToggle={this.iamInstanceToggle}
onToggle={iamInstanceToggle}
isReadOnly={this.disabledInputFields(s3Config, enableEdit)}
subLabel="Whether to use instance's IAM role for S3 backup."
/>
Expand Down Expand Up @@ -203,7 +196,7 @@ class AwsStorageConfiguration extends Component {
<YBButton
btnText="Edit Configuration"
btnClass="btn btn-orange"
onClick={onEditConfig}
onClick={() => onEditConfig(config)}
/>
{isDefinedNotNull(config) && (
<YBConfirmModal
Expand Down
34 changes: 27 additions & 7 deletions managed/ui/src/components/config/Storage/StorageConfiguration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,18 @@ class StorageConfiguration extends Component {
super(props);

this.state = {
enableEdit: false
enableEdit: false,
iamRoleEnabled: false
};
}

iamInstanceToggle = (event) => {
this.setState({ iamRoleEnabled: event.target.checked });
};


getConfigByType = (name, customerConfigs) => {
return customerConfigs.data.find((config) => config.name.toLowerCase() === name);
return customerConfigs?.data?.find((config) => config.name.toLowerCase() === name);
};

wrapFields = (configFields, configName, configControls) => {
Expand Down Expand Up @@ -205,6 +211,11 @@ class StorageConfiguration extends Component {
};

deleteStorageConfig = (configUUID) => {
this.setState({
enableEdit: false,
iamRoleEnabled: !this.state.iamRoleEnabled
});

this.props.deleteCustomerConfig(configUUID).then(() => {
this.props.reset(); // reset form to initial values
this.props.fetchCustomerConfigs();
Expand All @@ -223,15 +234,22 @@ class StorageConfiguration extends Component {
* This method will enable edit options for respective
* backup config.
*/
onEditConfig = () => {
this.setState({ enableEdit: true });
onEditConfig = (config) => {
this.setState({
enableEdit: true,
iamRoleEnabled: config?.IAM_INSTANCE_PROFILE || this.state.iamRoleEnabled
});
};

/**
* This method will disable the edit input fields.
*/
disableEditFields = () => {
this.setState({ enableEdit: false });
this.props.reset();
this.setState({
enableEdit: false,
iamRoleEnabled: !this.state.iamRoleEnabled
});
};

/**
Expand Down Expand Up @@ -324,7 +342,7 @@ class StorageConfiguration extends Component {
customerConfigs,
initialValues
} = this.props;
const { enableEdit } = this.state;
const { enableEdit, iamRoleEnabled } = this.state;
const activeTab = this.props.activeTab || Object.keys(storageConfigTypes)[0].toLowerCase();
const config = this.getConfigByType(activeTab, customerConfigs);

Expand All @@ -347,8 +365,10 @@ class StorageConfiguration extends Component {
<AwsStorageConfiguration
{...this.props}
deleteStorageConfig={this.deleteStorageConfig}
iamRoleEnabled={iamRoleEnabled}
iamInstanceToggle={this.iamInstanceToggle}
enableEdit={enableEdit}
onEditConfig={this.onEditConfig}
onEditConfig={(config) => this.onEditConfig(config)}
/>
</Tab>
];
Expand Down