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

Add further restrictions to user in edit data source. #7297

Closed
wants to merge 3 commits into from
Closed

Add further restrictions to user in edit data source. #7297

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
8af8be3
Add further restrictions to user in edit data source.
eemijuntunen Jul 18, 2024
bb66ec4
Merge branch 'opensearch-project:main' into main
eemijuntunen Jul 18, 2024
78cd1f9
Update to password/aws modal test setup
eemijuntunen Jul 18, 2024
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
26 changes: 22 additions & 4 deletions ...agement/public/components/edit_data_source/components/edit_form/edit_data_source_form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,7 @@ export class EditDataSourceForm extends React.Component<EditDataSourceProps, Edi
<>
<EuiButton
onClick={this.onClickUpdatePassword}
disabled={!this.props.canManageDataSource}
data-test-subj="editDatasourceUpdatePasswordBtn"
>
{
Expand All @@ -601,6 +602,7 @@ export class EditDataSourceForm extends React.Component<EditDataSourceProps, Edi
username={this.state.auth?.credentials?.username || ''}
handleUpdatePassword={this.updatePassword}
closeUpdatePasswordModal={this.closePasswordModal}
canManageDataSource={this.props.canManageDataSource}
/>
) : null}
</>
Expand All @@ -613,6 +615,7 @@ export class EditDataSourceForm extends React.Component<EditDataSourceProps, Edi
<EuiButton
onClick={this.onClickUpdateAwsCredential}
data-test-subj="editDatasourceUpdateAwsCredentialBtn"
disabled={!this.props.canManageDataSource}
>
{
<FormattedMessage
Expand All @@ -628,6 +631,7 @@ export class EditDataSourceForm extends React.Component<EditDataSourceProps, Edi
service={this.state.auth.credentials!.service}
handleUpdateAwsCredential={this.updateAwsCredential}
closeUpdateAwsCredentialModal={this.closeAwsCredentialModal}
canManageDataSource={this.props.canManageDataSource}
/>
) : null}
</>
Expand Down Expand Up @@ -725,6 +729,7 @@ export class EditDataSourceForm extends React.Component<EditDataSourceProps, Edi
isInvalid={!!this.state.formErrorsByField.title.length}
onChange={this.onChangeTitle}
onBlur={this.validateTitle}
disabled={!this.props.canManageDataSource}
/>
</EuiFormRow>
{/* Description */}
Expand All @@ -745,6 +750,7 @@ export class EditDataSourceForm extends React.Component<EditDataSourceProps, Edi
}
)}
onChange={this.onChangeDescription}
disabled={!this.props.canManageDataSource}
/>
</EuiFormRow>
</EuiDescribedFormGroup>
Expand Down Expand Up @@ -837,7 +843,7 @@ export class EditDataSourceForm extends React.Component<EditDataSourceProps, Edi
options={this.authOptions}
valueOfSelected={this.state.auth.type}
onChange={(value) => this.onChangeAuthType(value)}
disabled={this.authOptions.length <= 1}
disabled={this.authOptions.length <= 1 || !this.props.canManageDataSource}
name="Credential"
data-test-subj="editDataSourceSelectAuthType"
/>
Expand Down Expand Up @@ -883,6 +889,7 @@ export class EditDataSourceForm extends React.Component<EditDataSourceProps, Edi
value={this.state.auth.credentials?.region || ''}
onChange={this.onChangeRegion}
onBlur={this.validateRegion}
disabled={!this.props.canManageDataSource}
data-test-subj="editDataSourceFormRegionField"
name="dataSourceRegion"
/>
Expand All @@ -895,6 +902,7 @@ export class EditDataSourceForm extends React.Component<EditDataSourceProps, Edi
<EuiSuperSelect
options={sigV4ServiceOptions}
valueOfSelected={this.state.auth.credentials?.service}
disabled={!this.props.canManageDataSource}
onChange={(value) => this.onChangeSigV4ServiceName(value)}
name="ServiceName"
data-test-subj="editDataSourceFormSigV4ServiceTypeSelect"
Expand Down Expand Up @@ -924,7 +932,10 @@ export class EditDataSourceForm extends React.Component<EditDataSourceProps, Edi
onChange={this.onChangeAccessKey}
onBlur={this.validateAccessKey}
spellCheck={false}
disabled={this.props.existingDataSource.auth.type === AuthType.SigV4}
disabled={
this.props.existingDataSource.auth.type === AuthType.SigV4 ||
!this.props.canManageDataSource
}
data-test-subj="editDataSourceFormAccessKeyField"
name="dataSourceAccessKey"
/>
Expand Down Expand Up @@ -953,7 +964,10 @@ export class EditDataSourceForm extends React.Component<EditDataSourceProps, Edi
onChange={this.onChangeSecretKey}
onBlur={this.validateSecretKey}
spellCheck={false}
disabled={this.props.existingDataSource.auth.type === AuthType.SigV4}
disabled={
this.props.existingDataSource.auth.type === AuthType.SigV4 ||
!this.props.canManageDataSource
}
data-test-subj="editDataSourceFormSecretKeyField"
name="dataSourceSecretKey"
/>
Expand Down Expand Up @@ -989,6 +1003,7 @@ export class EditDataSourceForm extends React.Component<EditDataSourceProps, Edi
isInvalid={!!this.state.formErrorsByField.createCredential?.username?.length}
onChange={this.onChangeUsername}
onBlur={this.validateUsername}
disabled={!this.props.canManageDataSource}
/>
</EuiFormRow>

Expand Down Expand Up @@ -1018,7 +1033,10 @@ export class EditDataSourceForm extends React.Component<EditDataSourceProps, Edi
spellCheck={false}
onChange={this.onChangePassword}
onBlur={this.validatePassword}
disabled={this.props.existingDataSource.auth.type === AuthType.UsernamePasswordType}
disabled={
this.props.existingDataSource.auth.type === AuthType.UsernamePasswordType ||
!this.props.canManageDataSource
}
data-test-subj="updateDataSourceFormPasswordField"
/>
</EuiFlexItem>
Expand Down
1 change: 1 addition & 0 deletions ...t_data_source/components/update_aws_credential_modal/update_aws_credential_modal.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ describe('UpdateAwsCredentialModal', () => {
service: SigV4ServiceName.OpenSearch,
handleUpdateAwsCredential: mockHandleUpdateAwsCredential,
closeUpdateAwsCredentialModal: mockCloseUpdateAwsCredentialModal,
canManageDataSource: true,
};

it('updates new access key state on input change', () => {
Expand Down
4 changes: 4 additions & 0 deletions ...s/edit_data_source/components/update_aws_credential_modal/update_aws_credential_modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,15 @@ export interface UpdateAwsCredentialModalProps {
service: SigV4ServiceName;
handleUpdateAwsCredential: (accessKey: string, secretKey: string) => void;
closeUpdateAwsCredentialModal: () => void;
canManageDataSource: boolean;
}

export const UpdateAwsCredentialModal = ({
region,
service,
handleUpdateAwsCredential,
closeUpdateAwsCredentialModal,
canManageDataSource,
}: UpdateAwsCredentialModalProps) => {
/* State Variables */
const [newAccessKey, setNewAccessKey] = useState<string>('');
Expand Down Expand Up @@ -134,6 +136,7 @@ export const UpdateAwsCredentialModal = ({
spellCheck={false}
onChange={(e) => setNewAccessKey(e.target.value)}
onBlur={validateNewAccessKey}
disabled={!canManageDataSource}
/>
</EuiFormRow>

Expand All @@ -159,6 +162,7 @@ export const UpdateAwsCredentialModal = ({
spellCheck={false}
onChange={(e) => setNewSecretKey(e.target.value)}
onBlur={validateNewSecretKey}
disabled={!canManageDataSource}
/>
</EuiFormRow>
</EuiForm>
Expand Down
1 change: 1 addition & 0 deletions ...mponents/edit_data_source/components/update_password_modal/update_password_modal.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ describe('Datasource Management: Update Stored Password Modal', () => {
username={mockUserName}
handleUpdatePassword={mockFn}
closeUpdatePasswordModal={mockFn}
canManageDataSource={true}
/>
),
{
Expand Down
6 changes: 5 additions & 1 deletion ...ic/components/edit_data_source/components/update_password_modal/update_password_modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,14 @@ export interface UpdatePasswordModalProps {
username: string;
handleUpdatePassword: (password: string) => void;
closeUpdatePasswordModal: () => void;
canManageDataSource: boolean;
}

export const UpdatePasswordModal = ({
username,
handleUpdatePassword,
closeUpdatePasswordModal,
canManageDataSource,
}: UpdatePasswordModalProps) => {
/* State Variables */
const [newPassword, setNewPassword] = useState<string>('');
Expand Down Expand Up @@ -128,6 +130,7 @@ export const UpdatePasswordModal = ({
spellCheck={false}
onChange={(e) => setNewPassword(e.target.value)}
onBlur={validateNewPassword}
disabled={!canManageDataSource}
/>
</EuiFormRow>
{/* Password */}
Expand All @@ -153,6 +156,7 @@ export const UpdatePasswordModal = ({
spellCheck={false}
onChange={(e) => setConfirmNewPassword(e.target.value)}
onBlur={validateConfirmNewPassword}
disabled={!canManageDataSource}
/>
</EuiFormRow>
</EuiForm>
Expand All @@ -175,7 +179,7 @@ export const UpdatePasswordModal = ({
data-test-subj="updateStoredPasswordConfirmBtn"
onClick={onClickUpdatePassword}
fill={isFormValid()}
disabled={!isFormValid()}
disabled={!isFormValid() || !canManageDataSource}
>
{i18n.translate('dataSourcesManagement.editDataSource.updateStoredPassword', {
defaultMessage: 'Update stored password',
Expand Down
Loading