Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
489c851
[DocLinksService] Define privacyStatement property
Feb 28, 2022
84bff71
Fix dockLinks typo
Feb 28, 2022
029b6fe
Use docLinks instead of global constant
Mar 1, 2022
3ce79c9
Remove const
Mar 1, 2022
effa472
Improve imports
Mar 2, 2022
784b4be
Update snapshot to fix UTs
Mar 2, 2022
a1c5255
Merge branch 'main' into kbn-99767-privacy-statement-to-doc-links
kibanamachine Mar 2, 2022
4089786
Fix incorrect imports
Mar 2, 2022
2f7f8b5
Fix management section UTs
Mar 2, 2022
d2513c6
Merge branch 'main' into kbn-99767-privacy-statement-to-doc-links
Mar 3, 2022
3173ec1
Provide missing docLinks property to TelemetryManagementSectionComponent
Mar 3, 2022
f735a6a
Simplify props, fix UTs
Mar 8, 2022
c72a466
Merge branch 'main' into kbn-99767-privacy-statement-to-doc-links
Mar 8, 2022
cd3f609
Fix UTs broken by merge from main
Mar 8, 2022
6334d2f
Code cleanup
Mar 10, 2022
46a604d
Merge branch 'main' into kbn-99767-privacy-statement-to-doc-links
kibanamachine Mar 10, 2022
51331a3
Merge branch 'main' into kbn-99767-privacy-statement-to-doc-links
kibanamachine Mar 10, 2022
65a2a38
Merge branch 'main' into kbn-99767-privacy-statement-to-doc-links
gsoldevila Mar 14, 2022
a5c1fb6
Merge branch 'main' into kbn-99767-privacy-statement-to-doc-links
gsoldevila Mar 16, 2022
54c9d80
Merge branch 'main' into kbn-99767-privacy-statement-to-doc-links
gsoldevila Mar 16, 2022
19b65b1
Merge branch 'main' into kbn-99767-privacy-statement-to-doc-links
gsoldevila Mar 16, 2022
7739f0e
Merge branch 'main' into kbn-99767-privacy-statement-to-doc-links
gsoldevila Mar 16, 2022
95b8896
Merge branch 'main' into kbn-99767-privacy-statement-to-doc-links
gsoldevila Mar 17, 2022
2534034
Merge branch 'main' into kbn-99767-privacy-statement-to-doc-links
gsoldevila Mar 17, 2022
bf68a3c
Merge branch 'main' into kbn-99767-privacy-statement-to-doc-links
gsoldevila Mar 17, 2022
92835be
Merge branch 'main' into kbn-99767-privacy-statement-to-doc-links
kibanamachine Mar 17, 2022
7fb72a0
Merge branch 'main' into kbn-99767-privacy-statement-to-doc-links
gsoldevila Mar 17, 2022
1ce7ae2
Merge branch 'main' into kbn-99767-privacy-statement-to-doc-links
gsoldevila Mar 17, 2022
74783ee
Merge branch 'main' into kbn-99767-privacy-statement-to-doc-links
gsoldevila Mar 17, 2022
57e74d0
Merge branch 'main' into kbn-99767-privacy-statement-to-doc-links
gsoldevila Mar 17, 2022
2baac83
Merge branch 'main' into kbn-99767-privacy-statement-to-doc-links
gsoldevila Mar 17, 2022
988ec96
Merge branch 'main' into kbn-99767-privacy-statement-to-doc-links
gsoldevila Mar 18, 2022
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
3 changes: 3 additions & 0 deletions packages/kbn-doc-links/src/get_doc_links.ts
Original file line number Diff line number Diff line change
Expand Up @@ -602,5 +602,8 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => {
endpoints: {
troubleshooting: `${ELASTIC_WEBSITE_URL}guide/en/security/${DOC_LINK_VERSION}/ts-management.html#ts-endpoints`,
},
legal: {
privacyStatement: `${ELASTIC_WEBSITE_URL}legal/privacy-statement`,
},
});
};
3 changes: 3 additions & 0 deletions packages/kbn-doc-links/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -364,4 +364,7 @@ export interface DocLinks {
readonly endpoints: {
readonly troubleshooting: string;
};
readonly legal: {
readonly privacyStatement: string;
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import type { SharedUxDocLinksService } from '../doc_links';
/**
* A factory function for creating a Jest implementation of `SharedUxDocLinksService`.
*/
export type MockDockLinksServiceFactory = ServiceFactory<SharedUxDocLinksService>;
export type MockDocLinksServiceFactory = ServiceFactory<SharedUxDocLinksService>;

/**
* A factory function for creating a Jest-based implementation of `SharedUxDocLinksService`.
*/
export const docLinksServiceFactory: MockDockLinksServiceFactory = () => ({
export const docLinksServiceFactory: MockDocLinksServiceFactory = () => ({
dataViewsDocLink: 'dummy link',
});
2 changes: 1 addition & 1 deletion packages/kbn-shared-ux-services/src/services/mock/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { userPermissionsServiceFactory } from './permissions.mock';
import { platformServiceFactory } from './platform.mock';

export type { MockApplicationServiceFactory } from './application.mock';
export type { MockDockLinksServiceFactory } from './doc_links.mock';
export type { MockDocLinksServiceFactory } from './doc_links.mock';
export type { MockEditorsServiceFactory } from './editors.mock';
export type { MockHttpServiceFactory } from './http.mock';
export type { MockUserPermissionsServiceFactory } from './permissions.mock';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import type { SharedUxDocLinksService } from '../doc_links';
/**
* A factory function for creating a stubbed implementation of `SharedUxDocLinksService`.
*/
export type DockLinksServiceFactory = ServiceFactory<SharedUxDocLinksService>;
export type DocLinksServiceFactory = ServiceFactory<SharedUxDocLinksService>;

/**
* A factory function for creating a stubbed implementation of `SharedUxDocLinksService`.
*/
export const docLinksServiceFactory: DockLinksServiceFactory = () => ({
export const docLinksServiceFactory: DocLinksServiceFactory = () => ({
dataViewsDocLink: 'docs',
});
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ describe('AdvancedSettings', () => {
history={mockHistory}
enableSaving={true}
toasts={notificationServiceMock.createStartContract().toasts}
dockLinks={docLinksServiceMock.createStartContract().links}
docLinks={docLinksServiceMock.createStartContract().links}
uiSettings={mockConfig().core.uiSettings}
componentRegistry={new ComponentRegistry().start}
theme={themeServiceMock.createStartContract().theme$}
Expand All @@ -275,7 +275,7 @@ describe('AdvancedSettings', () => {
history={mockHistory}
enableSaving={false}
toasts={notificationServiceMock.createStartContract().toasts}
dockLinks={docLinksServiceMock.createStartContract().links}
docLinks={docLinksServiceMock.createStartContract().links}
uiSettings={mockConfig().core.uiSettings}
componentRegistry={new ComponentRegistry().start}
theme={themeServiceMock.createStartContract().theme$}
Expand All @@ -302,7 +302,7 @@ describe('AdvancedSettings', () => {
history={mockHistory}
enableSaving={false}
toasts={toasts}
dockLinks={docLinksServiceMock.createStartContract().links}
docLinks={docLinksServiceMock.createStartContract().links}
uiSettings={mockConfig().core.uiSettings}
componentRegistry={new ComponentRegistry().start}
theme={themeServiceMock.createStartContract().theme$}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ interface AdvancedSettingsProps {
history: ScopedHistory;
enableSaving: boolean;
uiSettings: IUiSettingsClient;
dockLinks: DocLinksStart['links'];
docLinks: DocLinksStart['links'];
toasts: ToastsStart;
theme: ThemeServiceStart['theme$'];
componentRegistry: ComponentRegistry['start'];
Expand Down Expand Up @@ -270,7 +270,7 @@ export class AdvancedSettings extends Component<AdvancedSettingsProps, AdvancedS
save={this.saveConfig}
showNoResultsMessage={!footerQueryMatched}
enableSaving={this.props.enableSaving}
dockLinks={this.props.dockLinks}
docLinks={this.props.docLinks}
toasts={this.props.toasts}
trackUiMetric={this.props.trackUiMetric}
queryText={query.text}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ describe('Field', () => {
handleChange={handleChange}
enableSaving={true}
toasts={notificationServiceMock.createStartContract().toasts}
dockLinks={docLinksServiceMock.createStartContract().links}
docLinks={docLinksServiceMock.createStartContract().links}
/>
);

Expand All @@ -226,7 +226,7 @@ describe('Field', () => {
handleChange={handleChange}
enableSaving={true}
toasts={notificationServiceMock.createStartContract().toasts}
dockLinks={docLinksServiceMock.createStartContract().links}
docLinks={docLinksServiceMock.createStartContract().links}
/>
);

Expand All @@ -240,7 +240,7 @@ describe('Field', () => {
handleChange={handleChange}
enableSaving={false}
toasts={notificationServiceMock.createStartContract().toasts}
dockLinks={docLinksServiceMock.createStartContract().links}
docLinks={docLinksServiceMock.createStartContract().links}
/>
);
expect(component).toMatchSnapshot();
Expand All @@ -257,7 +257,7 @@ describe('Field', () => {
handleChange={handleChange}
enableSaving={true}
toasts={notificationServiceMock.createStartContract().toasts}
dockLinks={docLinksServiceMock.createStartContract().links}
docLinks={docLinksServiceMock.createStartContract().links}
/>
);

Expand All @@ -274,7 +274,7 @@ describe('Field', () => {
handleChange={handleChange}
enableSaving={true}
toasts={notificationServiceMock.createStartContract().toasts}
dockLinks={docLinksServiceMock.createStartContract().links}
docLinks={docLinksServiceMock.createStartContract().links}
/>
);
expect(component).toMatchSnapshot();
Expand All @@ -289,7 +289,7 @@ describe('Field', () => {
handleChange={handleChange}
enableSaving={true}
toasts={notificationServiceMock.createStartContract().toasts}
dockLinks={docLinksServiceMock.createStartContract().links}
docLinks={docLinksServiceMock.createStartContract().links}
unsavedChanges={{
// @ts-ignore
value: exampleValues[setting.type],
Expand All @@ -311,7 +311,7 @@ describe('Field', () => {
handleChange={handleChange}
enableSaving={true}
toasts={notificationServiceMock.createStartContract().toasts}
dockLinks={docLinksServiceMock.createStartContract().links}
docLinks={docLinksServiceMock.createStartContract().links}
/>
);
const select = findTestSubject(component, `advancedSetting-editField-${setting.name}`);
Expand All @@ -333,7 +333,7 @@ describe('Field', () => {
handleChange={handleChange}
enableSaving={true}
toasts={notificationServiceMock.createStartContract().toasts}
dockLinks={docLinksServiceMock.createStartContract().links}
docLinks={docLinksServiceMock.createStartContract().links}
{...props}
/>
</I18nProvider>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ interface FieldProps {
setting: FieldSetting;
handleChange: (name: string, value: FieldState) => void;
enableSaving: boolean;
dockLinks: DocLinksStart['links'];
docLinks: DocLinksStart['links'];
toasts: ToastsStart;
clearChange?: (name: string) => void;
unsavedChanges?: FieldState;
Expand Down Expand Up @@ -459,7 +459,7 @@ export class Field extends PureComponent<FieldProps> {
let deprecation;

if (setting.deprecation) {
const links = this.props.dockLinks;
const links = this.props.docLinks;

deprecation = (
<>
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading