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

update searchableKeys in all Lookups & JobOutput

Browse Source
This commit is contained in:
Keith J. Grant
2021-07-30 16:11:12 -07:00
parent 262a2b70e2
commit 60f1919791
13 changed files with 28 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/src/components/AdHocCommands/AdHocCredentialStep.js
View File

@@ -9,6 +9,7 @@ import { CredentialsAPI } from 'api';
import { getQSConfig, parseQueryString, mergeParams } from 'util/qs'; import { getQSConfig, parseQueryString, mergeParams } from 'util/qs';
import useRequest from 'hooks/useRequest'; import useRequest from 'hooks/useRequest';
import { required } from 'util/validators'; import { required } from 'util/validators';
import { getSearchableKeys } from 'components/PaginatedTable';
import Popover from '../Popover'; import Popover from '../Popover';
import ContentError from '../ContentError'; import ContentError from '../ContentError';
@@ -59,9 +60,7 @@ function AdHocCredentialStep({ credentialTypeId }) {
relatedSearchableKeys: ( relatedSearchableKeys: (
actionsResponse?.data?.related_search_fields || [] actionsResponse?.data?.related_search_fields || []
).map((val) => val.slice(0, -8)), ).map((val) => val.slice(0, -8)),
searchableKeys: Object.keys( searchableKeys: getSearchableKeys(actionsResponse.data.actions?.GET),
actionsResponse.data.actions?.GET || {}
).filter((key) => actionsResponse.data.actions?.GET[key].filterable),
}; };
}, [credentialTypeId, history.location.search]), }, [credentialTypeId, history.location.search]),
{ {

5
awx/ui/src/components/AdHocCommands/AdHocExecutionEnvironmentStep.js
View File

@@ -6,6 +6,7 @@ import { Form, FormGroup } from '@patternfly/react-core';
import { ExecutionEnvironmentsAPI } from 'api'; import { ExecutionEnvironmentsAPI } from 'api';
import { parseQueryString, getQSConfig, mergeParams } from 'util/qs'; import { parseQueryString, getQSConfig, mergeParams } from 'util/qs';
import { getSearchableKeys } from 'components/PaginatedTable';
import useRequest from 'hooks/useRequest'; import useRequest from 'hooks/useRequest';
import Popover from '../Popover'; import Popover from '../Popover';
import ContentError from '../ContentError'; import ContentError from '../ContentError';
@@ -60,9 +61,7 @@ function AdHocExecutionEnvironmentStep({ organizationId }) {
relatedSearchableKeys: ( relatedSearchableKeys: (
actionsResponse?.data?.related_search_fields || [] actionsResponse?.data?.related_search_fields || []
).map((val) => val.slice(0, -8)), ).map((val) => val.slice(0, -8)),
searchableKeys: Object.keys( searchableKeys: getSearchableKeys(actionsResponse.data.actions?.GET),
actionsResponse.data.actions?.GET || {}
).filter((key) => actionsResponse.data.actions?.GET[key].filterable),
}; };
}, [history.location.search, organizationId]), }, [history.location.search, organizationId]),
{ {

5
awx/ui/src/components/AssociateModal/AssociateModal.js
View File

@@ -3,6 +3,7 @@ import { useHistory } from 'react-router-dom';
import { t } from '@lingui/macro'; import { t } from '@lingui/macro';
import { Button, Modal } from '@patternfly/react-core'; import { Button, Modal } from '@patternfly/react-core';
import { getSearchableKeys } from 'components/PaginatedTable';
import useRequest from 'hooks/useRequest'; import useRequest from 'hooks/useRequest';
import { getQSConfig, parseQueryString } from 'util/qs'; import { getQSConfig, parseQueryString } from 'util/qs';
import useSelected from 'hooks/useSelected'; import useSelected from 'hooks/useSelected';
@@ -53,9 +54,7 @@ function AssociateModal({
relatedSearchableKeys: ( relatedSearchableKeys: (
actionsResponse?.data?.related_search_fields || [] actionsResponse?.data?.related_search_fields || []
).map((val) => val.slice(0, -8)), ).map((val) => val.slice(0, -8)),
searchableKeys: Object.keys( searchableKeys: getSearchableKeys(actionsResponse.data.actions?.GET),
actionsResponse.data.actions?.GET || {}
).filter((key) => actionsResponse.data.actions?.GET[key].filterable),
}; };
}, [fetchRequest, optionsRequest, history.location.search, displayKey]), }, [fetchRequest, optionsRequest, history.location.search, displayKey]),
{ {

5
awx/ui/src/components/LaunchPrompt/steps/CredentialsStep.js
View File

@@ -7,6 +7,7 @@ import { useField } from 'formik';
import styled from 'styled-components'; import styled from 'styled-components';
import { Alert, ToolbarItem } from '@patternfly/react-core'; import { Alert, ToolbarItem } from '@patternfly/react-core';
import { CredentialsAPI, CredentialTypesAPI } from 'api'; import { CredentialsAPI, CredentialTypesAPI } from 'api';
import { getSearchableKeys } from 'components/PaginatedTable';
import { getQSConfig, parseQueryString } from 'util/qs'; import { getQSConfig, parseQueryString } from 'util/qs';
import useRequest from 'hooks/useRequest'; import useRequest from 'hooks/useRequest';
import AnsibleSelect from '../../AnsibleSelect'; import AnsibleSelect from '../../AnsibleSelect';
@@ -88,9 +89,7 @@ function CredentialsStep({
relatedSearchableKeys: ( relatedSearchableKeys: (
actionsResponse?.data?.related_search_fields || [] actionsResponse?.data?.related_search_fields || []
).map((val) => val.slice(0, -8)), ).map((val) => val.slice(0, -8)),
searchableKeys: Object.keys( searchableKeys: getSearchableKeys(actionsResponse.data.actions?.GET),
actionsResponse.data.actions?.GET || {}
).filter((key) => actionsResponse.data.actions?.GET[key].filterable),
}; };
}, [selectedType, history.location.search]), }, [selectedType, history.location.search]),
{ credentials: [], count: 0, relatedSearchableKeys: [], searchableKeys: [] } { credentials: [], count: 0, relatedSearchableKeys: [], searchableKeys: [] }

5
awx/ui/src/components/LaunchPrompt/steps/InventoryStep.js
View File

@@ -6,6 +6,7 @@ import { useField } from 'formik';
import styled from 'styled-components'; import styled from 'styled-components';
import { Alert } from '@patternfly/react-core'; import { Alert } from '@patternfly/react-core';
import { InventoriesAPI } from 'api'; import { InventoriesAPI } from 'api';
import { getSearchableKeys } from 'components/PaginatedTable';
import { getQSConfig, parseQueryString } from 'util/qs'; import { getQSConfig, parseQueryString } from 'util/qs';
import useRequest from 'hooks/useRequest'; import useRequest from 'hooks/useRequest';
import OptionsList from '../../OptionsList'; import OptionsList from '../../OptionsList';
@@ -45,9 +46,7 @@ function InventoryStep({ warningMessage = null }) {
relatedSearchableKeys: ( relatedSearchableKeys: (
actionsResponse?.data?.related_search_fields || [] actionsResponse?.data?.related_search_fields || []
).map((val) => val.slice(0, -8)), ).map((val) => val.slice(0, -8)),
searchableKeys: Object.keys( searchableKeys: getSearchableKeys(actionsResponse.data.actions?.GET),
actionsResponse.data.actions?.GET || {}
).filter((key) => actionsResponse.data.actions?.GET[key].filterable),
}; };
}, [history.location]), }, [history.location]),
{ {

5
awx/ui/src/components/Lookup/ApplicationLookup.js
View File

@@ -5,6 +5,7 @@ import { t } from '@lingui/macro';
import { FormGroup } from '@patternfly/react-core'; import { FormGroup } from '@patternfly/react-core';
import { ApplicationsAPI } from 'api'; import { ApplicationsAPI } from 'api';
import { Application } from 'types'; import { Application } from 'types';
import { getSearchableKeys } from 'components/PaginatedTable';
import { getQSConfig, parseQueryString } from 'util/qs'; import { getQSConfig, parseQueryString } from 'util/qs';
import useRequest from 'hooks/useRequest'; import useRequest from 'hooks/useRequest';
import Lookup from './Lookup'; import Lookup from './Lookup';
@@ -42,9 +43,7 @@ function ApplicationLookup({ onChange, value, label, fieldName, validate }) {
relatedSearchableKeys: ( relatedSearchableKeys: (
actionsResponse?.data?.related_search_fields || [] actionsResponse?.data?.related_search_fields || []
).map((val) => val.slice(0, -8)), ).map((val) => val.slice(0, -8)),
searchableKeys: Object.keys( searchableKeys: getSearchableKeys(actionsResponse?.data?.actions?.GET),
actionsResponse?.data?.actions?.GET || {}
).filter((key) => actionsResponse.data.actions?.GET[key].filterable),
}; };
}, [location]), }, [location]),
{ {

9
awx/ui/src/components/Lookup/CredentialLookup.js
View File

@@ -14,6 +14,7 @@ import { t } from '@lingui/macro';
import { FormGroup } from '@patternfly/react-core'; import { FormGroup } from '@patternfly/react-core';
import { CredentialsAPI } from 'api'; import { CredentialsAPI } from 'api';
import { Credential } from 'types'; import { Credential } from 'types';
import { getSearchableKeys } from 'components/PaginatedTable';
import { getQSConfig, parseQueryString, mergeParams } from 'util/qs'; import { getQSConfig, parseQueryString, mergeParams } from 'util/qs';
import useAutoPopulateLookup from 'hooks/useAutoPopulateLookup'; import useAutoPopulateLookup from 'hooks/useAutoPopulateLookup';
import useRequest from 'hooks/useRequest'; import useRequest from 'hooks/useRequest';
@@ -82,12 +83,10 @@ function CredentialLookup({
autoPopulateLookup(data.results); autoPopulateLookup(data.results);
} }
const searchKeys = Object.keys( const searchKeys = getSearchableKeys(actionsResponse.data.actions?.GET);
actionsResponse.data.actions?.GET || {} const item = searchKeys.find((k) => k.key === 'type');
).filter((key) => actionsResponse.data.actions?.GET[key].filterable);
const item = searchKeys.indexOf('type');
if (item) { if (item) {
searchKeys[item] = 'credential_type__kind'; item.key = 'credential_type__kind';
} }
return { return {

5
awx/ui/src/components/Lookup/ExecutionEnvironmentLookup.js
View File

@@ -4,6 +4,7 @@ import { useLocation } from 'react-router-dom';
import { t } from '@lingui/macro'; import { t } from '@lingui/macro';
import { FormGroup, Tooltip } from '@patternfly/react-core'; import { FormGroup, Tooltip } from '@patternfly/react-core';
import { ExecutionEnvironmentsAPI, ProjectsAPI } from 'api'; import { ExecutionEnvironmentsAPI, ProjectsAPI } from 'api';
import { getSearchableKeys } from 'components/PaginatedTable';
import { ExecutionEnvironment } from 'types'; import { ExecutionEnvironment } from 'types';
import { getQSConfig, parseQueryString, mergeParams } from 'util/qs'; import { getQSConfig, parseQueryString, mergeParams } from 'util/qs';
import useRequest from 'hooks/useRequest'; import useRequest from 'hooks/useRequest';
@@ -109,9 +110,7 @@ function ExecutionEnvironmentLookup({
relatedSearchableKeys: ( relatedSearchableKeys: (
actionsResponse?.data?.related_search_fields || [] actionsResponse?.data?.related_search_fields || []
).map((val) => val.slice(0, -8)), ).map((val) => val.slice(0, -8)),
searchableKeys: Object.keys( searchableKeys: getSearchableKeys(actionsResponse.data.actions?.GET),
actionsResponse.data.actions?.GET || {}
).filter((key) => actionsResponse.data.actions?.GET[key].filterable),
}; };
}, [ }, [
location, location,

5
awx/ui/src/components/Lookup/InstanceGroupsLookup.js
View File

@@ -6,6 +6,7 @@ import { t, Trans } from '@lingui/macro';
import { FormGroup } from '@patternfly/react-core'; import { FormGroup } from '@patternfly/react-core';
import { InstanceGroupsAPI } from 'api'; import { InstanceGroupsAPI } from 'api';
import { InstanceGroup } from 'types'; import { InstanceGroup } from 'types';
import { getSearchableKeys } from 'components/PaginatedTable';
import { getQSConfig, parseQueryString } from 'util/qs'; import { getQSConfig, parseQueryString } from 'util/qs';
import useRequest from 'hooks/useRequest'; import useRequest from 'hooks/useRequest';
import Popover from '../Popover'; import Popover from '../Popover';
@@ -47,9 +48,7 @@ function InstanceGroupsLookup({
relatedSearchableKeys: ( relatedSearchableKeys: (
actionsResponse?.data?.related_search_fields || [] actionsResponse?.data?.related_search_fields || []
).map((val) => val.slice(0, -8)), ).map((val) => val.slice(0, -8)),
searchableKeys: Object.keys( searchableKeys: getSearchableKeys(actionsResponse.data.actions?.GET),
actionsResponse.data.actions?.GET || {}
).filter((key) => actionsResponse.data.actions?.GET[key].filterable),
}; };
}, [history.location]), }, [history.location]),
{ {

5
awx/ui/src/components/Lookup/MultiCredentialsLookup.js
View File

@@ -5,6 +5,7 @@ import PropTypes from 'prop-types';
import { t } from '@lingui/macro'; import { t } from '@lingui/macro';
import { ToolbarItem, Alert } from '@patternfly/react-core'; import { ToolbarItem, Alert } from '@patternfly/react-core';
import { CredentialsAPI, CredentialTypesAPI } from 'api'; import { CredentialsAPI, CredentialTypesAPI } from 'api';
import { getSearchableKeys } from 'components/PaginatedTable';
import useRequest from 'hooks/useRequest'; import useRequest from 'hooks/useRequest';
import { getQSConfig, parseQueryString } from 'util/qs'; import { getQSConfig, parseQueryString } from 'util/qs';
import useIsMounted from 'hooks/useIsMounted'; import useIsMounted from 'hooks/useIsMounted';
@@ -100,9 +101,7 @@ function MultiCredentialsLookup({
relatedSearchableKeys: ( relatedSearchableKeys: (
actionsResponse?.data?.related_search_fields || [] actionsResponse?.data?.related_search_fields || []
).map((val) => val.slice(0, -8)), ).map((val) => val.slice(0, -8)),
searchableKeys: Object.keys( searchableKeys: getSearchableKeys(actionsResponse.data.actions?.GET),
actionsResponse.data.actions?.GET || {}
).filter((key) => actionsResponse.data.actions?.GET[key].filterable),
}; };
}, [selectedType, history.location]), }, [selectedType, history.location]),
{ {

5
awx/ui/src/components/Lookup/OrganizationLookup.js
View File

@@ -6,6 +6,7 @@ import { FormGroup } from '@patternfly/react-core';
import { OrganizationsAPI } from 'api'; import { OrganizationsAPI } from 'api';
import { Organization } from 'types'; import { Organization } from 'types';
import { getQSConfig, parseQueryString } from 'util/qs'; import { getQSConfig, parseQueryString } from 'util/qs';
import { getSearchableKeys } from 'components/PaginatedTable';
import useRequest from 'hooks/useRequest'; import useRequest from 'hooks/useRequest';
import useAutoPopulateLookup from 'hooks/useAutoPopulateLookup'; import useAutoPopulateLookup from 'hooks/useAutoPopulateLookup';
import OptionsList from '../OptionsList'; import OptionsList from '../OptionsList';
@@ -57,9 +58,7 @@ function OrganizationLookup({
relatedSearchableKeys: ( relatedSearchableKeys: (
actionsResponse?.data?.related_search_fields || [] actionsResponse?.data?.related_search_fields || []
).map((val) => val.slice(0, -8)), ).map((val) => val.slice(0, -8)),
searchableKeys: Object.keys( searchableKeys: getSearchableKeys(actionsResponse.data.actions?.GET),
actionsResponse.data.actions?.GET || {}
).filter((key) => actionsResponse.data.actions?.GET[key].filterable),
}; };
}, [autoPopulate, autoPopulateLookup, history.location.search]), }, [autoPopulate, autoPopulateLookup, history.location.search]),
{ {

5
awx/ui/src/components/Lookup/ProjectLookup.js
View File

@@ -7,6 +7,7 @@ import { ProjectsAPI } from 'api';
import { Project } from 'types'; import { Project } from 'types';
import useAutoPopulateLookup from 'hooks/useAutoPopulateLookup'; import useAutoPopulateLookup from 'hooks/useAutoPopulateLookup';
import useRequest from 'hooks/useRequest'; import useRequest from 'hooks/useRequest';
import { getSearchableKeys } from 'components/PaginatedTable';
import { getQSConfig, parseQueryString } from 'util/qs'; import { getQSConfig, parseQueryString } from 'util/qs';
import OptionsList from '../OptionsList'; import OptionsList from '../OptionsList';
import Popover from '../Popover'; import Popover from '../Popover';
@@ -56,9 +57,7 @@ function ProjectLookup({
relatedSearchableKeys: ( relatedSearchableKeys: (
actionsResponse?.data?.related_search_fields || [] actionsResponse?.data?.related_search_fields || []
).map((val) => val.slice(0, -8)), ).map((val) => val.slice(0, -8)),
searchableKeys: Object.keys( searchableKeys: getSearchableKeys(actionsResponse.data.actions?.GET),
actionsResponse.data.actions?.GET || {}
).filter((key) => actionsResponse.data.actions?.GET[key].filterable),
canEdit: canEdit:
Boolean(actionsResponse.data.actions.POST) || isOverrideDisabled, Boolean(actionsResponse.data.actions.POST) || isOverrideDisabled,
}; };

5
awx/ui/src/screens/Job/Job.js
View File

@@ -14,6 +14,7 @@ import { Card, PageSection } from '@patternfly/react-core';
import ContentError from 'components/ContentError'; import ContentError from 'components/ContentError';
import ContentLoading from 'components/ContentLoading'; import ContentLoading from 'components/ContentLoading';
import RoutedTabs from 'components/RoutedTabs'; import RoutedTabs from 'components/RoutedTabs';
import { getSearchableKeys } from 'components/PaginatedTable';
import useRequest from 'hooks/useRequest'; import useRequest from 'hooks/useRequest';
import { getJobModel } from 'util/jobs'; import { getJobModel } from 'util/jobs';
import JobDetail from './JobDetail'; import JobDetail from './JobDetail';
@@ -70,9 +71,7 @@ function Job({ setBreadcrumb }) {
eventRelatedSearchableKeys: ( eventRelatedSearchableKeys: (
eventOptions?.related_search_fields || [] eventOptions?.related_search_fields || []
).map((val) => val.slice(0, -8)), ).map((val) => val.slice(0, -8)),
eventSearchableKeys: Object.keys( eventSearchableKeys: getSearchableKeys(eventOptions?.actions?.GET),
eventOptions?.actions?.GET || {}
).filter((key) => eventOptions?.actions?.GET[key].filterable),
}; };
}, [id, type, setBreadcrumb]), }, [id, type, setBreadcrumb]),
{ {