External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-18 17:37:30 -02:30
Code Issues Packages Projects Releases Wiki Activity

Pulls CredentialPlugins out of CredentialFormFields and into the root of the shared dir

Browse Source
This commit is contained in:
mabashian
2020-06-18 14:43:07 -04:00
parent aed96de195
commit 62054bbfc8
13 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialField.jsx
View File

@@ -14,7 +14,7 @@ import { FieldTooltip, PasswordInput } from '../../../../components/FormField';
import AnsibleSelect from '../../../../components/AnsibleSelect'; import AnsibleSelect from '../../../../components/AnsibleSelect';
import { CredentialType } from '../../../../types'; import { CredentialType } from '../../../../types';
import { required } from '../../../../util/validators'; import { required } from '../../../../util/validators';
import { CredentialPluginField } from './CredentialPlugins'; import { CredentialPluginField } from '../CredentialPlugins';
import BecomeMethodField from './BecomeMethodField'; import BecomeMethodField from './BecomeMethodField';
const FileUpload = styled(PFFileUpload)` const FileUpload = styled(PFFileUpload)`

4
awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginField.jsx → awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginField.jsx
View File

@@ -11,8 +11,8 @@ import {
Tooltip, Tooltip,
} from '@patternfly/react-core'; } from '@patternfly/react-core';
import { KeyIcon } from '@patternfly/react-icons'; import { KeyIcon } from '@patternfly/react-icons';
import { FieldTooltip } from '../../../../../components/FormField'; import { FieldTooltip } from '../../../../components/FormField';
import FieldWithPrompt from '../../../../../components/FieldWithPrompt'; import FieldWithPrompt from '../../../../components/FieldWithPrompt';
import { CredentialPluginPrompt } from './CredentialPluginPrompt'; import { CredentialPluginPrompt } from './CredentialPluginPrompt';
import CredentialPluginSelected from './CredentialPluginSelected'; import CredentialPluginSelected from './CredentialPluginSelected';

2
awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginField.test.jsx → awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginField.test.jsx
View File

@@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import { Formik } from 'formik'; import { Formik } from 'formik';
import { TextInput } from '@patternfly/react-core'; import { TextInput } from '@patternfly/react-core';
import { mountWithContexts } from '../../../../../../testUtils/enzymeHelpers'; import { mountWithContexts } from '../../../../../testUtils/enzymeHelpers';
import CredentialPluginField from './CredentialPluginField'; import CredentialPluginField from './CredentialPluginField';
const fieldOptions = { const fieldOptions = {

0
awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.jsx → awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.jsx
View File

14
awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.test.jsx → awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialPluginPrompt.test.jsx
View File

@@ -3,15 +3,15 @@ import { act } from 'react-dom/test-utils';
import { import {
mountWithContexts, mountWithContexts,
waitForElement, waitForElement,
} from '../../../../../../../testUtils/enzymeHelpers'; } from '../../../../../../testUtils/enzymeHelpers';
import { CredentialsAPI, CredentialTypesAPI } from '../../../../../../api'; import { CredentialsAPI, CredentialTypesAPI } from '../../../../../api';
import selectedCredential from '../../../data.cyberArkCredential.json'; import selectedCredential from '../../data.cyberArkCredential.json';
import azureVaultCredential from '../../../data.azureVaultCredential.json'; import azureVaultCredential from '../../data.azureVaultCredential.json';
import hashiCorpCredential from '../../../data.hashiCorpCredential.json'; import hashiCorpCredential from '../../data.hashiCorpCredential.json';
import CredentialPluginPrompt from './CredentialPluginPrompt'; import CredentialPluginPrompt from './CredentialPluginPrompt';
jest.mock('../../../../../../api/models/Credentials'); jest.mock('../../../../../api/models/Credentials');
jest.mock('../../../../../../api/models/CredentialTypes'); jest.mock('../../../../../api/models/CredentialTypes');
CredentialsAPI.test.mockResolvedValue({}); CredentialsAPI.test.mockResolvedValue({});

14
awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginPrompt/CredentialsStep.jsx → awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/CredentialsStep.jsx
View File

@@ -3,13 +3,13 @@ import { useHistory } from 'react-router-dom';
import { withI18n } from '@lingui/react'; import { withI18n } from '@lingui/react';
import { t } from '@lingui/macro'; import { t } from '@lingui/macro';
import { useField } from 'formik'; import { useField } from 'formik';
import { CredentialsAPI } from '../../../../../../api'; import { CredentialsAPI } from '../../../../../api';
import CheckboxListItem from '../../../../../../components/CheckboxListItem'; import CheckboxListItem from '../../../../../components/CheckboxListItem';
import ContentError from '../../../../../../components/ContentError'; import ContentError from '../../../../../components/ContentError';
import DataListToolbar from '../../../../../../components/DataListToolbar'; import DataListToolbar from '../../../../../components/DataListToolbar';
import PaginatedDataList from '../../../../../../components/PaginatedDataList'; import PaginatedDataList from '../../../../../components/PaginatedDataList';
import { getQSConfig, parseQueryString } from '../../../../../../util/qs'; import { getQSConfig, parseQueryString } from '../../../../../util/qs';
import useRequest from '../../../../../../util/useRequest'; import useRequest from '../../../../../util/useRequest';
const QS_CONFIG = getQSConfig('credential', { const QS_CONFIG = getQSConfig('credential', {
page: 1, page: 1,

16
awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginPrompt/MetadataStep.jsx → awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/MetadataStep.jsx
View File

@@ -5,14 +5,14 @@ import { useField, useFormikContext } from 'formik';
import styled from 'styled-components'; import styled from 'styled-components';
import { Button, Form, FormGroup, Tooltip } from '@patternfly/react-core'; import { Button, Form, FormGroup, Tooltip } from '@patternfly/react-core';
import { QuestionCircleIcon as PFQuestionCircleIcon } from '@patternfly/react-icons'; import { QuestionCircleIcon as PFQuestionCircleIcon } from '@patternfly/react-icons';
import { CredentialsAPI, CredentialTypesAPI } from '../../../../../../api'; import { CredentialsAPI, CredentialTypesAPI } from '../../../../../api';
import AnsibleSelect from '../../../../../../components/AnsibleSelect'; import AnsibleSelect from '../../../../../components/AnsibleSelect';
import ContentError from '../../../../../../components/ContentError'; import ContentError from '../../../../../components/ContentError';
import ContentLoading from '../../../../../../components/ContentLoading'; import ContentLoading from '../../../../../components/ContentLoading';
import FormField from '../../../../../../components/FormField'; import FormField from '../../../../../components/FormField';
import { FormFullWidthLayout } from '../../../../../../components/FormLayout'; import { FormFullWidthLayout } from '../../../../../components/FormLayout';
import useRequest from '../../../../../../util/useRequest'; import useRequest from '../../../../../util/useRequest';
import { required } from '../../../../../../util/validators'; import { required } from '../../../../../util/validators';
import { CredentialPluginTestAlert } from '..'; import { CredentialPluginTestAlert } from '..';
const QuestionCircleIcon = styled(PFQuestionCircleIcon)` const QuestionCircleIcon = styled(PFQuestionCircleIcon)`

0
awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginPrompt/index.js → awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginPrompt/index.js
View File

4
awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginSelected.jsx → awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginSelected.jsx
View File

@@ -5,8 +5,8 @@ import { t, Trans } from '@lingui/macro';
import styled from 'styled-components'; import styled from 'styled-components';
import { Button, ButtonVariant, Tooltip } from '@patternfly/react-core'; import { Button, ButtonVariant, Tooltip } from '@patternfly/react-core';
import { KeyIcon } from '@patternfly/react-icons'; import { KeyIcon } from '@patternfly/react-icons';
import CredentialChip from '../../../../../components/CredentialChip'; import CredentialChip from '../../../../components/CredentialChip';
import { Credential } from '../../../../../types'; import { Credential } from '../../../../types';
const SelectedCredential = styled.div` const SelectedCredential = styled.div`
display: flex; display: flex;

4
awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginSelected.test.jsx → awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginSelected.test.jsx
View File

@@ -1,6 +1,6 @@
import React from 'react'; import React from 'react';
import { mountWithContexts } from '../../../../../../testUtils/enzymeHelpers'; import { mountWithContexts } from '../../../../../testUtils/enzymeHelpers';
import selectedCredential from '../../data.cyberArkCredential.json'; import selectedCredential from '../data.cyberArkCredential.json';
import CredentialPluginSelected from './CredentialPluginSelected'; import CredentialPluginSelected from './CredentialPluginSelected';
describe('<CredentialPluginSelected />', () => { describe('<CredentialPluginSelected />', () => {

0
awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginTestAlert.jsx → awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginTestAlert.jsx
View File

0
awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/CredentialPluginTestAlert.test.jsx → awx/ui_next/src/screens/Credential/shared/CredentialPlugins/CredentialPluginTestAlert.test.jsx
View File

0
awx/ui_next/src/screens/Credential/shared/CredentialFormFields/CredentialPlugins/index.js → awx/ui_next/src/screens/Credential/shared/CredentialPlugins/index.js
View File