diff --git a/src/core/public/chrome/chrome_service.tsx b/src/core/public/chrome/chrome_service.tsx index d52f6694ee06..04d9c3e51b6d 100644 --- a/src/core/public/chrome/chrome_service.tsx +++ b/src/core/public/chrome/chrome_service.tsx @@ -320,6 +320,7 @@ export class ChromeService { navGroupsMap$={navGroup.getNavGroupsMap$()} setCurrentNavGroup={navGroup.setCurrentNavGroup} workspaceList$={workspaces.workspaceList$} + darkmode={uiSettings.get('theme:darkMode')} /> ), diff --git a/src/core/public/chrome/constants.ts b/src/core/public/chrome/constants.ts index d16393088a16..27fe2c2db3e3 100644 --- a/src/core/public/chrome/constants.ts +++ b/src/core/public/chrome/constants.ts @@ -27,6 +27,10 @@ * specific language governing permissions and limitations * under the License. */ +import wazuh from '../../../../package.json'; + +export const WAZUH_MAJOR = wazuh.wazuh.version.split('.')[0]; +export const WAZUH_MINOR = wazuh.wazuh.version.split('.')[1]; export const OPENSEARCH_DASHBOARDS_FEEDBACK_LINK = 'https://wazuh.com/community/join-us-on-slack'; export const OPENSEARCH_DASHBOARDS_ASK_OPENSEARCH_LINK = OPENSEARCH_DASHBOARDS_FEEDBACK_LINK; @@ -37,3 +41,4 @@ export enum RightNavigationOrder { Settings = 10, DevTool = 20, } +export const WAZUH_DOCUMENTATION_URL = `https://documentation.wazuh.com/${WAZUH_MAJOR}.${WAZUH_MINOR}/`; diff --git a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap index 98cb378e46ee..0866ba0010e4 100644 --- a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap +++ b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap @@ -455,6 +455,7 @@ exports[`Header handles visibility and lock changes 1`] = ` "thrownError": null, } } + darkmode={false} forceAppSwitcherNavigation$={ BehaviorSubject { "_isScalar": false, @@ -4445,6 +4446,7 @@ exports[`Header handles visibility and lock changes 1`] = ` className="euiHeaderSectionItem euiHeaderSectionItem--borderLeft" > + - Wazuh documentation + Documentation
- +
@@ -1849,7 +1863,7 @@ exports[`Header help menu hides survey link 1`] = ` /> @@ -1859,12 +1873,12 @@ exports[`Header help menu hides survey link 1`] = ` - Open an issue in GitHub + Google Group @@ -2013,13 +2027,14 @@ exports[`Header help menu hides survey link 1`] = ` > @@ -2027,6 +2042,7 @@ exports[`Header help menu hides survey link 1`] = ` className="euiButtonEmpty__content" iconSide="left" iconSize="s" + iconType="/ui/logos/icon_light.svg" textProps={ Object { "className": "euiButtonEmpty__text", @@ -2036,15 +2052,28 @@ exports[`Header help menu hides survey link 1`] = ` + + + - Wazuh documentation + Documentation @@ -2060,19 +2089,22 @@ exports[`Header help menu hides survey link 1`] = ` - + @@ -2128,7 +2173,7 @@ exports[`Header help menu hides survey link 1`] = ` className="euiButtonEmpty__content" iconSide="left" iconSize="s" - iconType="logoGithub" + iconType="/ui/logos/google_groups.svg" textProps={ Object { "className": "euiButtonEmpty__text", @@ -2142,12 +2187,12 @@ exports[`Header help menu hides survey link 1`] = ` className="euiButtonContent__icon" color="inherit" size="s" - type="logoGithub" + type="/ui/logos/google_groups.svg" > @@ -2155,11 +2200,11 @@ exports[`Header help menu hides survey link 1`] = ` className="euiButtonEmpty__text" > - Open an issue in GitHub + Google Group @@ -2183,6 +2228,7 @@ exports[`Header help menu hides survey link 1`] = ` exports[`Header help menu renders survey link 1`] = ` + - Wazuh documentation + Documentation
- +
+ - Give feedback + Projects on Github @@ -4050,7 +4114,7 @@ exports[`Header help menu renders survey link 1`] = ` /> @@ -4060,12 +4124,12 @@ exports[`Header help menu renders survey link 1`] = ` - Open an issue in GitHub + Google Group @@ -4214,13 +4278,14 @@ exports[`Header help menu renders survey link 1`] = ` > @@ -4228,6 +4293,7 @@ exports[`Header help menu renders survey link 1`] = ` className="euiButtonEmpty__content" iconSide="left" iconSize="s" + iconType="/ui/logos/icon_light.svg" textProps={ Object { "className": "euiButtonEmpty__text", @@ -4237,15 +4303,28 @@ exports[`Header help menu renders survey link 1`] = ` + + + - Wazuh documentation + Documentation @@ -4261,19 +4340,22 @@ exports[`Header help menu renders survey link 1`] = ` - + @@ -4322,6 +4418,7 @@ exports[`Header help menu renders survey link 1`] = ` className="euiButtonEmpty__content" iconSide="left" iconSize="s" + iconType="logoGithub" textProps={ Object { "className": "euiButtonEmpty__text", @@ -4331,15 +4428,28 @@ exports[`Header help menu renders survey link 1`] = ` + + + - Give feedback + Projects on Github @@ -4363,14 +4473,14 @@ exports[`Header help menu renders survey link 1`] = ` @@ -4378,7 +4488,7 @@ exports[`Header help menu renders survey link 1`] = ` className="euiButtonEmpty__content" iconSide="left" iconSize="s" - iconType="logoGithub" + iconType="/ui/logos/google_groups.svg" textProps={ Object { "className": "euiButtonEmpty__text", @@ -4392,12 +4502,12 @@ exports[`Header help menu renders survey link 1`] = ` className="euiButtonContent__icon" color="inherit" size="s" - type="logoGithub" + type="/ui/logos/google_groups.svg" > @@ -4405,11 +4515,11 @@ exports[`Header help menu renders survey link 1`] = ` className="euiButtonEmpty__text" > - Open an issue in GitHub + Google Group diff --git a/src/core/public/chrome/ui/header/header.test.tsx b/src/core/public/chrome/ui/header/header.test.tsx index 1cfcc84acee5..1956b4e41a6c 100644 --- a/src/core/public/chrome/ui/header/header.test.tsx +++ b/src/core/public/chrome/ui/header/header.test.tsx @@ -85,6 +85,7 @@ function mockProps() { navControlsLeftBottom$: new BehaviorSubject([]), setCurrentNavGroup: jest.fn(() => {}), workspaceList$: new BehaviorSubject([]), + darkmode: false, }; } diff --git a/src/core/public/chrome/ui/header/header.tsx b/src/core/public/chrome/ui/header/header.tsx index 9c4ae18d4a39..e536433a1742 100644 --- a/src/core/public/chrome/ui/header/header.tsx +++ b/src/core/public/chrome/ui/header/header.tsx @@ -111,6 +111,7 @@ export interface HeaderProps { navGroupsMap$: Observable>; setCurrentNavGroup: ChromeNavGroupServiceStartContract['setCurrentNavGroup']; workspaceList$: Observable; + darkmode: boolean; } export function Header({ @@ -288,6 +289,7 @@ export function Header({ opensearchDashboardsDocLink={opensearchDashboardsDocLink} opensearchDashboardsVersion={opensearchDashboardsVersion} surveyLink={survey} + darkmode={observables.darkmode} /> diff --git a/src/core/public/chrome/ui/header/header_help_menu.test.tsx b/src/core/public/chrome/ui/header/header_help_menu.test.tsx index fbcd47367120..2099b9a2a471 100644 --- a/src/core/public/chrome/ui/header/header_help_menu.test.tsx +++ b/src/core/public/chrome/ui/header/header_help_menu.test.tsx @@ -15,6 +15,7 @@ function mockProps() { opensearchDashboardsDocLink: '/doclink', opensearchDashboardsVersion: '1.0', useDefaultContent: true, + darkmode: false, }; } diff --git a/src/core/public/chrome/ui/header/header_help_menu.tsx b/src/core/public/chrome/ui/header/header_help_menu.tsx index feec39386c4e..678e5cdb382f 100644 --- a/src/core/public/chrome/ui/header/header_help_menu.tsx +++ b/src/core/public/chrome/ui/header/header_help_menu.tsx @@ -51,7 +51,7 @@ import { ExclusiveUnion } from '@elastic/eui'; import { combineLatest } from 'rxjs'; import { HeaderExtension } from './header_extension'; import { ChromeHelpExtension } from '../../chrome_service'; -import { GITHUB_CREATE_ISSUE_LINK } from '../../constants'; +import { WAZUH_DOCUMENTATION_URL } from '../../constants'; /** @public */ export type ChromeHelpExtensionMenuGitHubLink = EuiButtonEmptyProps & { @@ -124,6 +124,7 @@ interface Props { useDefaultContent?: boolean; opensearchDashboardsDocLink: string; surveyLink?: string; + darkmode: boolean; } interface State { @@ -199,26 +200,38 @@ class HeaderHelpMenuUI extends Component { intl, opensearchDashboardsVersion, useDefaultContent, - opensearchDashboardsDocLink, surveyLink, + darkmode, } = this.props; - const { helpExtension, helpSupportUrl } = this.state; + const { helpExtension } = this.state; const defaultContent = useDefaultContent ? ( - + - + @@ -226,10 +239,16 @@ class HeaderHelpMenuUI extends Component { {surveyLink && (
- + @@ -239,15 +258,15 @@ class HeaderHelpMenuUI extends Component { diff --git a/src/core/server/core_app/assets/logos/google_groups.svg b/src/core/server/core_app/assets/logos/google_groups.svg new file mode 100644 index 000000000000..934cf1d86d56 --- /dev/null +++ b/src/core/server/core_app/assets/logos/google_groups.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + diff --git a/src/core/server/core_app/assets/logos/icon_dark.svg b/src/core/server/core_app/assets/logos/icon_dark.svg new file mode 100644 index 000000000000..966e74def86c --- /dev/null +++ b/src/core/server/core_app/assets/logos/icon_dark.svg @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/src/core/server/core_app/assets/logos/icon_light.svg b/src/core/server/core_app/assets/logos/icon_light.svg new file mode 100644 index 000000000000..cc9df8577f88 --- /dev/null +++ b/src/core/server/core_app/assets/logos/icon_light.svg @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/src/core/tsconfig.json b/src/core/tsconfig.json index 3281d2f19cfe..fedd701d7e3c 100644 --- a/src/core/tsconfig.json +++ b/src/core/tsconfig.json @@ -5,7 +5,8 @@ "outDir": "./target/types", "emitDeclarationOnly": true, "declaration": true, - "declarationMap": true + "declarationMap": true, + "rootDir": "../../" }, "include": [ "public/**/*", @@ -15,9 +16,8 @@ "test_helpers/**/*", "utils/**/*", "index.ts", - "typings.ts" + "typings.ts", + "../../package.json" ], - "references": [ - { "path": "../test_utils/" } - ] + "references": [{ "path": "../test_utils/" }] }