Skip to content

[Search] Fix mapping tab breaking docLinks and refresh #181729

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

Merged
sphilipse merged 2 commits into from
Apr 25, 2024
Merged

[Search] Fix mapping tab breaking docLinks and refresh #181729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ecc207
[Search] Fix mapping tab breaking docLinks and refresh
sphilipse Apr 25, 2024
9e69760
Fix unnecessary label translation
sphilipse Apr 25, 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
20 changes: 16 additions & 4 deletions .../public/applications/enterprise_search_content/components/search_index/index_mappings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import React, { useEffect, useState } from 'react';
import React, { useEffect, useMemo, useState } from 'react';

import { useActions, useValues } from 'kea';

Expand Down Expand Up @@ -46,7 +46,9 @@ import './index_mappings.scss';
export const SearchIndexIndexMappings: React.FC = () => {
const { indexName } = useValues(IndexNameLogic);
const { hasDocumentLevelSecurityFeature, isHiddenIndex } = useValues(IndexViewLogic);
const { indexMappingComponent: IndexMappingComponent, productFeatures } = useValues(KibanaLogic);
const { indexMappingComponent, productFeatures } = useValues(KibanaLogic);

const IndexMappingComponent = useMemo(() => indexMappingComponent, []);

const [selectedIndexType, setSelectedIndexType] =
useState<AccessControlSelectorOption['value']>('content-index');
Expand Down Expand Up @@ -154,7 +156,12 @@ export const SearchIndexIndexMappings: React.FC = () => {
</p>
</EuiText>
<EuiSpacer size="s" />
<EuiLink href={docLinks.connectorsMappings} target="_blank" external>
<EuiLink
data-test-subj="enterpriseSearchSearchIndexIndexMappingsLearnHowToCustomizeIndexMappingsAndSettingsLink"
Copy link
Copy Markdown
Member

@efegurkan efegurkan Apr 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick: wrong schema for test/telemetry. We should update the autofix for the plugin.

href={docLinks.connectorsMappings}
target="_blank"
external
>
{i18n.translate('xpack.enterpriseSearch.content.searchIndex.mappings.docLink', {
defaultMessage: 'Learn how to customize index mappings and settings',
})}
Expand Down Expand Up @@ -187,7 +194,12 @@ export const SearchIndexIndexMappings: React.FC = () => {
</p>
</EuiText>
<EuiSpacer size="s" />
<EuiLink href={docLinks.ingestPipelines} target="_blank" external>
<EuiLink
data-test-subj="enterpriseSearchSearchIndexIndexMappingsLearnMoreLink"
href={docLinks.ingestPipelines}
target="_blank"
external
>
{i18n.translate('xpack.enterpriseSearch.content.searchIndex.transform.docLink', {
defaultMessage: 'Learn more',
})}
Expand Down
14 changes: 8 additions & 6 deletions ...nents/mappings_editor/components/document_fields/field_parameters/select_inference_id.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ export const SelectInferenceId = ({ onChange, 'data-test-subj': dataTestSubj }:

return subscription.unsubscribe;
}, [subscribe, onChange]);
const selectedOptions = options.filter((option) => option.checked).find((k) => k.label);
const selectedOptionLabel = options.find((option) => option.checked)?.label;
const [isInferencePopoverVisible, setIsInferencePopoverVisible] = useState<boolean>(false);
const [inferenceEndpointError, setInferenceEndpointError] = useState<string | undefined>(
undefined
Expand Down Expand Up @@ -180,11 +180,13 @@ export const SelectInferenceId = ({ onChange, 'data-test-subj': dataTestSubj }:
setIsInferencePopoverVisible(!isInferencePopoverVisible);
}}
>
<FormattedMessage
id="xpack.idxMgmt.mappingsEditor.parameters.inferenceId.popover.button"
defaultMessage="{defaultValue}"
values={{ defaultValue: selectedOptions?.label }}
/>
{selectedOptionLabel ||
i18n.translate(
'xpack.idxMgmt.mappingsEditor.parameters.inferenceId.popover.defaultLabel',
{
defaultMessage: 'No model selected',
}
)}
</EuiButton>
</>
)}
Expand Down
2 changes: 2 additions & 0 deletions ...t/public/application/sections/home/index_list/details_page/index_mapping_with_context.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/

import React from 'react';
import { documentationService } from '../../../../services';
import { UIM_APP_NAME } from '../../../../../../common/constants/ui_metric';
import { httpService } from '../../../../services/http';
import { notificationService } from '../../../../services/notification';
Expand All @@ -28,6 +29,7 @@ export const IndexMappingWithContext: React.FC<IndexMappingWithContextProps> = (
httpService.setup(core.http);
notificationService.setup(core.notifications);
}
documentationService.setup(core.docLinks);

const newDependencies: AppDependencies = {
...dependencies,
Expand Down
6 changes: 0 additions & 6 deletions ...nt/public/application/sections/home/index_list/details_page/index_mappings_embeddable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ import { dynamic } from '@kbn/shared-ux-utility';
import React, { Suspense, ComponentType } from 'react';
import { IndexMappingWithContextProps } from './index_mapping_with_context_types';

// const IndexMappingWithContext = lazy<ComponentType<IndexMappingWithContextProps>>(async () => {
// return {
// default: (await import('./index_mapping_with_context')).IndexMappingWithContext,
// };
// });

const IndexMappingWithContext = dynamic<ComponentType<IndexMappingWithContextProps>>(() =>
import('./index_mapping_with_context').then((mod) => ({ default: mod.IndexMappingWithContext }))
);
Expand Down