mirror of
https://github.com/elastic/kibana.git
synced 2025-04-23 17:28:26 -04:00
# Backport This will backport the following commits from `main` to `8.8`: - [[Enterprise Search] update search-ui + remove searchable-fields config (#157209)](https://github.com/elastic/kibana/pull/157209) <!--- Backport version: 8.9.7 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Joseph McElroy","email":"joseph.mcelroy@elastic.co"},"sourceCommit":{"committedDate":"2023-05-09T20:59:45Z","message":"[Enterprise Search] update search-ui + remove searchable-fields config (#157209)\n\nThis change updates search-ui connector which uses `query_string`\r\ninstead of `combined_fields`. `combined_fields` has challenges with\r\nsearching across fields with different search_analyzers. For simplicity,\r\nwe are using `query_string`, inline with the default search_template\r\nrecommendation.\r\n\r\n\r\n\r\n1b63f296-6dbb-4ff5-ae02-ca01c6e0a6e4","sha":"252d1a88d5ff3342207ace27aa9fa0a088065778","branchLabelMapping":{"^v8.9.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["backport","release_note:skip","Team:EnterpriseSearch","v8.8.0","v8.9.0"],"number":157209,"url":"https://github.com/elastic/kibana/pull/157209","mergeCommit":{"message":"[Enterprise Search] update search-ui + remove searchable-fields config (#157209)\n\nThis change updates search-ui connector which uses `query_string`\r\ninstead of `combined_fields`. `combined_fields` has challenges with\r\nsearching across fields with different search_analyzers. For simplicity,\r\nwe are using `query_string`, inline with the default search_template\r\nrecommendation.\r\n\r\n\r\n\r\n1b63f296-6dbb-4ff5-ae02-ca01c6e0a6e4","sha":"252d1a88d5ff3342207ace27aa9fa0a088065778"}},"sourceBranch":"main","suggestedTargetBranches":["8.8"],"targetPullRequestStates":[{"branch":"8.8","label":"v8.8.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.9.0","labelRegex":"^v8.9.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/157209","number":157209,"mergeCommit":{"message":"[Enterprise Search] update search-ui + remove searchable-fields config (#157209)\n\nThis change updates search-ui connector which uses `query_string`\r\ninstead of `combined_fields`. `combined_fields` has challenges with\r\nsearching across fields with different search_analyzers. For simplicity,\r\nwe are using `query_string`, inline with the default search_template\r\nrecommendation.\r\n\r\n\r\n\r\n1b63f296-6dbb-4ff5-ae02-ca01c6e0a6e4","sha":"252d1a88d5ff3342207ace27aa9fa0a088065778"}}]}] BACKPORT-->
This commit is contained in:
Joseph McElroy
GitHub
parent
85b22d307a
commit
14f615ec0f
4 changed files with 33 additions and 52 deletions
10
package.json
10
package.json
|
|
@ -100,12 +100,12 @@
|
|||
"@elastic/filesaver": "1.1.2",
|
||||
"@elastic/node-crypto": "1.2.1",
|
||||
"@elastic/numeral": "^2.5.1",
|
||||
"@elastic/react-search-ui": "^1.19.1",
|
||||
"@elastic/react-search-ui-views": "^1.19.1",
|
||||
"@elastic/react-search-ui": "^1.20.2",
|
||||
"@elastic/react-search-ui-views": "^1.20.2",
|
||||
"@elastic/request-crypto": "2.0.1",
|
||||
"@elastic/search-ui": "^1.19.1",
|
||||
"@elastic/search-ui-app-search-connector": "^1.19.1",
|
||||
"@elastic/search-ui-engines-connector": "^1.19.1",
|
||||
"@elastic/search-ui": "^1.20.2",
|
||||
"@elastic/search-ui-app-search-connector": "^1.20.2",
|
||||
"@elastic/search-ui-engines-connector": "^1.20.2",
|
||||
"@emotion/cache": "^11.10.3",
|
||||
"@emotion/css": "^11.10.0",
|
||||
"@emotion/react": "^11.10.4",
|
||||
|
|
|
|||
|
|
@ -283,7 +283,7 @@ export const EngineSearchPreview: React.FC = () => {
|
|||
const [showConfigurationPopover, setShowConfigurationPopover] = useState<boolean>(false);
|
||||
// const [lastAPICall, setLastAPICall] = useState<null | APICallData>(null); Uncomment when view this API call is needed
|
||||
const { engineName, isLoadingEngine } = useValues(EngineViewLogic);
|
||||
const { resultFields, searchableFields, sortableFields } = useValues(EngineSearchPreviewLogic);
|
||||
const { resultFields, sortableFields } = useValues(EngineSearchPreviewLogic);
|
||||
const { engineData } = useValues(EngineIndicesLogic);
|
||||
|
||||
const config: SearchDriverOptions = useMemo(() => {
|
||||
|
|
@ -296,10 +296,9 @@ export const EngineSearchPreview: React.FC = () => {
|
|||
hasA11yNotifications: true,
|
||||
searchQuery: {
|
||||
result_fields: resultFields,
|
||||
search_fields: searchableFields,
|
||||
},
|
||||
};
|
||||
}, [http, engineName, resultFields, searchableFields]);
|
||||
}, [http, engineName, resultFields]);
|
||||
|
||||
if (!engineData) return null;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
import { kea, MakeLogicType } from 'kea';
|
||||
|
||||
import { FieldConfiguration, SearchFieldConfiguration } from '@elastic/search-ui';
|
||||
import { FieldConfiguration } from '@elastic/search-ui';
|
||||
|
||||
import { FetchEngineFieldCapabilitiesApiLogic } from '../../../api/engines/fetch_engine_field_capabilities_api_logic';
|
||||
import { EngineNameLogic } from '../engine_name_logic';
|
||||
|
|
@ -21,7 +21,6 @@ export interface EngineSearchPreviewValues {
|
|||
engineName: typeof EngineNameLogic.values.engineName;
|
||||
fieldTypesByIndex: Record<string, Record<string, string>>;
|
||||
resultFields: Record<string, FieldConfiguration>;
|
||||
searchableFields: Record<string, SearchFieldConfiguration>;
|
||||
sortableFields: string[];
|
||||
}
|
||||
|
||||
|
|
@ -84,23 +83,6 @@ export const EngineSearchPreviewLogic = kea<
|
|||
);
|
||||
},
|
||||
],
|
||||
searchableFields: [
|
||||
() => [selectors.engineFieldCapabilitiesData],
|
||||
(data: EngineSearchPreviewValues['engineFieldCapabilitiesData']) => {
|
||||
if (!data) return {};
|
||||
|
||||
const searchableFields = Object.fromEntries(
|
||||
data.fields
|
||||
.filter(
|
||||
({ type, metadata_field: isMeta, searchable: isSearchable }) =>
|
||||
type === 'text' && !isMeta && isSearchable
|
||||
)
|
||||
.map(({ name }) => [name, { weight: 1 }])
|
||||
);
|
||||
|
||||
return searchableFields;
|
||||
},
|
||||
],
|
||||
sortableFields: [
|
||||
() => [selectors.engineFieldCapabilitiesData],
|
||||
(data: EngineSearchPreviewValues['engineFieldCapabilitiesData']) => {
|
||||
|
|
|
|||
50
yarn.lock
50
yarn.lock
|
|
@ -1622,23 +1622,23 @@
|
|||
resolved "https://registry.yarnpkg.com/@elastic/numeral/-/numeral-2.5.1.tgz#96acf39c3d599950646ef8ccfd24a3f057cf4932"
|
||||
integrity sha512-Tby6TKjixRFY+atVNeYUdGr9m0iaOq8230KTwn8BbUhkh7LwozfgKq0U98HRX7n63ZL62szl+cDKTYzh5WPCFQ==
|
||||
|
||||
"@elastic/react-search-ui-views@1.19.1", "@elastic/react-search-ui-views@^1.19.1":
|
||||
version "1.19.1"
|
||||
resolved "https://registry.yarnpkg.com/@elastic/react-search-ui-views/-/react-search-ui-views-1.19.1.tgz#c44c5c823de5b5c61cc2f1f6bedbd973af0e78bc"
|
||||
integrity sha512-1IOVoG5GYKvrKoYZL247bd7eKVQAR4iJaYBkA4KOa8CEXdc3+N0Z63uAit+4+pAH6Z6IONNwk2iQPMDf2zjQGA==
|
||||
"@elastic/react-search-ui-views@1.20.2", "@elastic/react-search-ui-views@^1.20.2":
|
||||
version "1.20.2"
|
||||
resolved "https://registry.yarnpkg.com/@elastic/react-search-ui-views/-/react-search-ui-views-1.20.2.tgz#31d9e90be0694b1259d1885463919eb7478b6511"
|
||||
integrity sha512-nx2XOxQ9ONIrd9MhJ1/z0p7AXYYXUr4Tqx8TPUqQd6m/yTa55qrCdEcBm59+MGSBFtVCRsix8KBMiOij+/afxQ==
|
||||
dependencies:
|
||||
"@elastic/search-ui" "1.19.1"
|
||||
"@elastic/search-ui" "1.20.2"
|
||||
downshift "^3.2.10"
|
||||
rc-pagination "^1.20.1"
|
||||
react-select "^5.0.0"
|
||||
|
||||
"@elastic/react-search-ui@^1.19.1":
|
||||
version "1.19.1"
|
||||
resolved "https://registry.yarnpkg.com/@elastic/react-search-ui/-/react-search-ui-1.19.1.tgz#57e68e2e8c34cc8ac99d8f3825b4034db90e5b97"
|
||||
integrity sha512-cB3tsDgVmp6fSrNJH8qmTZVDab4M0qKa0pyxrDSALJK8J7RFS9P4tO8Pb31R0jn4dtt1JDcy+e3JhHv/RABwlQ==
|
||||
"@elastic/react-search-ui@^1.20.2":
|
||||
version "1.20.2"
|
||||
resolved "https://registry.yarnpkg.com/@elastic/react-search-ui/-/react-search-ui-1.20.2.tgz#dc2f29c932a675de06c5df1dbc773db41c897907"
|
||||
integrity sha512-riVo1Dja4TpI3WFuQVQUmMiRPSV+nAxdkF05UCA/4H5P2IAqzrRjEw4jVpR4vcj+4gAHJcLppYwmtjcn3h1dKw==
|
||||
dependencies:
|
||||
"@elastic/react-search-ui-views" "1.19.1"
|
||||
"@elastic/search-ui" "1.19.1"
|
||||
"@elastic/react-search-ui-views" "1.20.2"
|
||||
"@elastic/search-ui" "1.20.2"
|
||||
|
||||
"@elastic/request-crypto@2.0.1":
|
||||
version "2.0.1"
|
||||
|
|
@ -1649,26 +1649,26 @@
|
|||
"@types/node-jose" "1.1.10"
|
||||
node-jose "2.1.0"
|
||||
|
||||
"@elastic/search-ui-app-search-connector@^1.19.1":
|
||||
version "1.19.1"
|
||||
resolved "https://registry.yarnpkg.com/@elastic/search-ui-app-search-connector/-/search-ui-app-search-connector-1.19.1.tgz#beb6b317207ace9480fc8cd0a16e63e3c4657e0d"
|
||||
integrity sha512-cHYtk2M6F1OdkJSXdb6EMvn6p4oE2duNZ/Il+W++6l5NXzyqPrVnh+6uGEPN64j+CxvTwxAEdV2uQbUpEKBrtw==
|
||||
"@elastic/search-ui-app-search-connector@^1.20.2":
|
||||
version "1.20.2"
|
||||
resolved "https://registry.yarnpkg.com/@elastic/search-ui-app-search-connector/-/search-ui-app-search-connector-1.20.2.tgz#873acdb3ee7709374746a5d3665edb0b14606d8e"
|
||||
integrity sha512-oKXCQV3woyPjn2A8nfsFyG0P5K83hcJlDV0UjjOe1sSM2nUw1nFZa22gYTLVczhVF54N3z6ZTW6ntSJkaqqfAw==
|
||||
dependencies:
|
||||
"@elastic/app-search-javascript" "^8.1.2"
|
||||
"@elastic/search-ui" "1.19.1"
|
||||
"@elastic/search-ui" "1.20.2"
|
||||
|
||||
"@elastic/search-ui-engines-connector@^1.19.1":
|
||||
version "1.19.1"
|
||||
resolved "https://registry.yarnpkg.com/@elastic/search-ui-engines-connector/-/search-ui-engines-connector-1.19.1.tgz#5efab4f405e7bfb573fb0a81ad776d02e2248d23"
|
||||
integrity sha512-LHTeSmDGOR5T5Y/9K1AngedHp3KAgdMhUq7KgvJnRkYogOCCfqWizcVXdURKXp8A+t6Gocg24o1TMWOSBR+3+w==
|
||||
"@elastic/search-ui-engines-connector@^1.20.2":
|
||||
version "1.20.2"
|
||||
resolved "https://registry.yarnpkg.com/@elastic/search-ui-engines-connector/-/search-ui-engines-connector-1.20.2.tgz#7ebcb2c4d962333afc24bdd41a293888007ba58d"
|
||||
integrity sha512-s0Q1aEpL5wzIQk9gRKFyvcdX04uBzZOmMU2lMljSvycYIw1Z9SC37q7da8Eal+WY5cAFrfWLbWETI5UwwAwhdg==
|
||||
dependencies:
|
||||
"@elastic/search-ui" "1.19.1"
|
||||
"@elastic/search-ui" "1.20.2"
|
||||
"@searchkit/sdk" "^3.0.0"
|
||||
|
||||
"@elastic/search-ui@1.19.1", "@elastic/search-ui@^1.19.1":
|
||||
version "1.19.1"
|
||||
resolved "https://registry.yarnpkg.com/@elastic/search-ui/-/search-ui-1.19.1.tgz#76c1c72248e42f326970a6f3b0b445ab5f581847"
|
||||
integrity sha512-2DcZ1b4fiL0vjRhVFU1OnqGKOy7aVJr563VO9FDpUUFCXlMySKWnuwh0kcUatqeNO4Sxw9GyJZbtzOgnTyQaag==
|
||||
"@elastic/search-ui@1.20.2", "@elastic/search-ui@^1.20.2":
|
||||
version "1.20.2"
|
||||
resolved "https://registry.yarnpkg.com/@elastic/search-ui/-/search-ui-1.20.2.tgz#afb679b4a06ef14ce8ab4a4f3053e09c68588386"
|
||||
integrity sha512-48O0jKeMbhohxnVB6oOxT5R+x4nrwG0UWvFTCWPZJ4hKCLsPZZOWIFHziMaxhR8f0ckZCoiif+eD6FAgDW6kwA==
|
||||
dependencies:
|
||||
date-fns "^1.30.1"
|
||||
deep-equal "^1.0.1"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue