Skip to content

Commit

Permalink
[8.x] [Search][Connectors] Links and icons review (#197214) (#197426)
Browse files Browse the repository at this point in the history 
# Backport

This will backport the following commits from `main` to `8.x`:
- [[Search][Connectors] Links and icons review
(#197214)](#197214)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"José Luis
González","email":"joseluisgj@gmail.com"},"sourceCommit":{"committedDate":"2024-10-23T12:32:18Z","message":"[Search][Connectors]
Links and icons review (#197214)\n\n## Summary\r\n\r\nThis PR fixes a
few UX issue:\r\n\r\nAll links after generating config elements are
external links in order\r\nto don't lose the context:\r\n![CleanShot
2024-10-22 at 13
14\r\n43@2x](https://github.com/user-attachments/assets/99e05d93-6149-4b3c-9fe7-4192e8870d22)\r\n\r\nUsing
proper Connectors logo and better size:\r\n\r\n![CleanShot 2024-10-22 at
13
15\r\n55@2x](https://github.com/user-attachments/assets/9e524870-7102-44d3-94d2-d7eb1d1f6b41)\r\n\r\nFinish
up footer links take us to respective sections:\r\n\r\n![CleanShot
2024-10-22 at 13
16\r\n35@2x](https://github.com/user-attachments/assets/deb36a7e-a49f-40a0-9e75-957af6cda751)\r\n\r\n---------\r\n\r\nCo-authored-by:
Sander Philipse
<94373878+sphilipse@users.noreply.github.com>","sha":"d8149bf55712b57f6ebc9f27b73681a1c9eccddf","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","release_note:skip","v9.0.0","backport:prev-major"],"title":"[Search][Connectors]
Links and icons
review","number":197214,"url":"https://github.com/elastic/kibana/pull/197214","mergeCommit":{"message":"[Search][Connectors]
Links and icons review (#197214)\n\n## Summary\r\n\r\nThis PR fixes a
few UX issue:\r\n\r\nAll links after generating config elements are
external links in order\r\nto don't lose the context:\r\n![CleanShot
2024-10-22 at 13
14\r\n43@2x](https://github.com/user-attachments/assets/99e05d93-6149-4b3c-9fe7-4192e8870d22)\r\n\r\nUsing
proper Connectors logo and better size:\r\n\r\n![CleanShot 2024-10-22 at
13
15\r\n55@2x](https://github.com/user-attachments/assets/9e524870-7102-44d3-94d2-d7eb1d1f6b41)\r\n\r\nFinish
up footer links take us to respective sections:\r\n\r\n![CleanShot
2024-10-22 at 13
16\r\n35@2x](https://github.com/user-attachments/assets/deb36a7e-a49f-40a0-9e75-957af6cda751)\r\n\r\n---------\r\n\r\nCo-authored-by:
Sander Philipse
<94373878+sphilipse@users.noreply.github.com>","sha":"d8149bf55712b57f6ebc9f27b73681a1c9eccddf"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/197214","number":197214,"mergeCommit":{"message":"[Search][Connectors]
Links and icons review (#197214)\n\n## Summary\r\n\r\nThis PR fixes a
few UX issue:\r\n\r\nAll links after generating config elements are
external links in order\r\nto don't lose the context:\r\n![CleanShot
2024-10-22 at 13
14\r\n43@2x](https://github.com/user-attachments/assets/99e05d93-6149-4b3c-9fe7-4192e8870d22)\r\n\r\nUsing
proper Connectors logo and better size:\r\n\r\n![CleanShot 2024-10-22 at
13
15\r\n55@2x](https://github.com/user-attachments/assets/9e524870-7102-44d3-94d2-d7eb1d1f6b41)\r\n\r\nFinish
up footer links take us to respective sections:\r\n\r\n![CleanShot
2024-10-22 at 13
16\r\n35@2x](https://github.com/user-attachments/assets/deb36a7e-a49f-40a0-9e75-957af6cda751)\r\n\r\n---------\r\n\r\nCo-authored-by:
Sander Philipse
<94373878+sphilipse@users.noreply.github.com>","sha":"d8149bf55712b57f6ebc9f27b73681a1c9eccddf"}}]}]
BACKPORT-->

Co-authored-by: José Luis González <joseluisgj@gmail.com>
  • Loading branch information
@kibanamachine @JoseLuisGJ
kibanamachine and JoseLuisGJ authored Oct 23, 2024
1 parent 1785b76 commit ef41d6e
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 15 deletions.
6 changes: 6 additions & 0 deletions ...erprise_search_content/components/connector_detail/components/generated_config_fields.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ export const GeneratedConfigFields: React.FC<GeneratedConfigFieldsProps> = ({
</EuiFlexItem>
<EuiFlexItem>
<EuiLinkTo
external
target="_blank"
to={generateEncodedPath(CONNECTOR_DETAIL_PATH, {
connectorId: connector.id,
})}
Expand All @@ -137,6 +139,8 @@ export const GeneratedConfigFields: React.FC<GeneratedConfigFieldsProps> = ({
>
<EuiFlexItem grow={false}>
<EuiLinkTo
external
target="_blank"
to={generateEncodedPath(CONNECTOR_DETAIL_PATH, {
connectorId: connector.id,
})}
Expand Down Expand Up @@ -174,6 +178,8 @@ export const GeneratedConfigFields: React.FC<GeneratedConfigFieldsProps> = ({
<EuiFlexItem>
{connector.index_name && (
<EuiLinkTo
external
target="_blank"
to={generateEncodedPath(SEARCH_INDEX_PATH, {
indexName: connector.index_name,
})}
Expand Down
24 changes: 12 additions & 12 deletions ...ntent/components/connectors/create_connector/components/connector_description_popover.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@ import {
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';

import connectorLogo from '../../../../../../assets/images/connector_logo_network_drive_version.svg';
import connectorLogo from '../../../../../../assets/images/connector.svg';

const nativePopoverPanels = [
{
description: i18n.translate(
'xpack.enterpriseSearch.connectorDescriptionPopover.connectorDescriptionBadge.native.chooseADataSourceLabel',
{ defaultMessage: 'Choose a data source you would like to sync' }
),
icons: [<EuiIcon type="documents" />],
icons: [<EuiIcon size="l" type="documents" />],
id: 'native-choose-source',
},
{
description: i18n.translate(
'xpack.enterpriseSearch.connectorDescriptionPopover.connectorDescriptionBadge.native.configureConnectorLabel',
{ defaultMessage: 'Configure your connector using our Kibana UI' }
),
icons: [<EuiIcon type={connectorLogo} />, <EuiIcon type="logoElastic" />],
icons: [<EuiIcon size="l" type={connectorLogo} />, <EuiIcon size="l" type="logoElastic" />],
id: 'native-configure-connector',
},
];
Expand All @@ -46,7 +46,7 @@ const connectorClientPopoverPanels = [
'xpack.enterpriseSearch.connectorDescriptionPopover.connectorDescriptionBadge.client.chooseADataSourceLabel',
{ defaultMessage: 'Choose a data source you would like to sync' }
),
icons: [<EuiIcon type="documents" />],
icons: [<EuiIcon size="l" type="documents" />],
id: 'client-choose-source',
},
{
Expand All @@ -58,9 +58,9 @@ const connectorClientPopoverPanels = [
}
),
icons: [
<EuiIcon type={connectorLogo} />,
<EuiIcon type="sortRight" />,
<EuiIcon type="launch" />,
<EuiIcon size="l" type={connectorLogo} />,
<EuiIcon size="l" type="sortRight" />,
<EuiIcon size="l" type="launch" />,
],
id: 'client-deploy',
},
Expand All @@ -72,11 +72,11 @@ const connectorClientPopoverPanels = [
}
),
icons: [
<EuiIcon type="documents" />,
<EuiIcon type="sortRight" />,
<EuiIcon type={connectorLogo} />,
<EuiIcon type="sortRight" />,
<EuiIcon type="logoElastic" />,
<EuiIcon size="l" type="documents" />,
<EuiIcon size="l" type="sortRight" />,
<EuiIcon size="l" type={connectorLogo} />,
<EuiIcon size="l" type="sortRight" />,
<EuiIcon size="l" type="logoElastic" />,
],
id: 'client-configure-connector',
},
Expand Down
15 changes: 12 additions & 3 deletions ...tions/enterprise_search_content/components/connectors/create_connector/finish_up_step.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,15 @@ import { i18n } from '@kbn/i18n';

import { useKibana } from '@kbn/kibana-react-plugin/public';

import { APPLICATIONS_PLUGIN } from '../../../../../../common/constants';
import { APPLICATIONS_PLUGIN, ELASTICSEARCH_PLUGIN } from '../../../../../../common/constants';

import { KibanaDeps } from '../../../../../../common/types';

import { PLAYGROUND_PATH } from '../../../../applications/routes';
import { generateEncodedPath } from '../../../../shared/encode_path_params';
import { HttpLogic } from '../../../../shared/http';
import { KibanaLogic } from '../../../../shared/kibana';
import { DEV_TOOLS_CONSOLE_PATH } from '../../../routes';

import { CONNECTOR_DETAIL_TAB_PATH } from '../../../routes';
import { ConnectorDetailTabId } from '../../connector_detail/connector_detail';
Expand All @@ -62,6 +64,9 @@ export const FinishUpStep: React.FC<FinishUpStepProps> = ({ title }) => {
const { startSync } = useActions(SyncsLogic);

const isSyncing = isWaitingForSync || isSyncingProp;

const { http } = useValues(HttpLogic);
const { application } = useValues(KibanaLogic);
useEffect(() => {
setTimeout(() => {
window.scrollTo({
Expand Down Expand Up @@ -307,7 +312,9 @@ export const FinishUpStep: React.FC<FinishUpStepProps> = ({ title }) => {
'Use your favorite language client to query your data in your app',
}
)}
onClick={() => {}}
onClick={() => {
application.navigateToUrl(http.basePath.prepend(ELASTICSEARCH_PLUGIN.URL));
}}
display="subdued"
/>
</EuiFlexItem>
Expand Down Expand Up @@ -335,7 +342,9 @@ export const FinishUpStep: React.FC<FinishUpStepProps> = ({ title }) => {
'Tools for interacting with your data, such as console, profiler, Grok debugger and more',
}
)}
onClick={() => {}}
onClick={() => {
application.navigateToUrl(http.basePath.prepend(DEV_TOOLS_CONSOLE_PATH));
}}
display="subdued"
/>
</EuiFlexItem>
Expand Down

0 comments on commit ef41d6e

Please sign in to comment.