From 43150e3798334bc85d9c2770e0efed200216052c Mon Sep 17 00:00:00 2001 From: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com> Date: Tue, 16 Aug 2022 13:42:33 +0200 Subject: [PATCH] Moved the file config-equivalences to common (#4399) * common/config-equivalences * add changelog (cherry picked from commit a40a2aed1e044f536e5f55d889c9f067007364b6) --- CHANGELOG.md | 2 +- {public/utils => common}/config-equivalences.js | 2 +- public/components/settings/configuration/components/header.tsx | 2 +- public/components/settings/configuration/configuration.tsx | 2 +- server/lib/initial-wazuh-config.ts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename {public/utils => common}/config-equivalences.js (99%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f56e889fe..09df447a61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ All notable changes to the Wazuh app project will be documented in this file. ### Fixed -- Wazuh.yml review: fixed link to web documentation, improved in-file documentation and fixed some grammatical errors. [#4378](https://github.com/wazuh/wazuh-kibana-app/pull/4378) +- Wazuh.yml review: fixed link to web documentation, improved in-file documentation and fixed some grammatical errors. [#4378](https://github.com/wazuh/wazuh-kibana-app/pull/4378) [#4399](https://github.com/wazuh/wazuh-kibana-app/pull/4399) - Fixed an error during the generation of a group's report, if the request to the Wazuh API fails [#4350](https://github.com/wazuh/wazuh-kibana-app/pull/4350) - Fixed a problem with the group's report, when the group has no agents [#4350](https://github.com/wazuh/wazuh-kibana-app/pull/4350) - Fixed path in logo customization section [#4352](https://github.com/wazuh/wazuh-kibana-app/pull/4352) diff --git a/public/utils/config-equivalences.js b/common/config-equivalences.js similarity index 99% rename from public/utils/config-equivalences.js rename to common/config-equivalences.js index b2044e89db..0441e3f8b1 100644 --- a/public/utils/config-equivalences.js +++ b/common/config-equivalences.js @@ -1,4 +1,4 @@ -import { ASSETS_PUBLIC_URL, PLUGIN_PLATFORM_NAME } from "../../common/constants"; +import { ASSETS_PUBLIC_URL, PLUGIN_PLATFORM_NAME } from "./constants"; export const configEquivalences = { pattern: "Default index pattern to use on the app. If there's no valid index pattern, the app will automatically create one with the name indicated in this option.", diff --git a/public/components/settings/configuration/components/header.tsx b/public/components/settings/configuration/components/header.tsx index 90515665e8..baee512ec3 100644 --- a/public/components/settings/configuration/components/header.tsx +++ b/public/components/settings/configuration/components/header.tsx @@ -12,7 +12,7 @@ */ import React, { useState, useEffect, Fragment } from 'react'; -import {categoriesNames} from '../../../../utils/config-equivalences'; +import {categoriesNames} from '../../../../../common/config-equivalences'; import { AppNavigate } from '../../../../react-services/app-navigate'; import { EuiFlexGroup, diff --git a/public/components/settings/configuration/configuration.tsx b/public/components/settings/configuration/configuration.tsx index 158bea977f..780af7476f 100644 --- a/public/components/settings/configuration/configuration.tsx +++ b/public/components/settings/configuration/configuration.tsx @@ -26,7 +26,7 @@ import { nameEquivalence, categoriesEquivalence, formEquivalence -} from '../../../utils/config-equivalences'; +} from '../../../../common/config-equivalences'; import store from '../../../redux/store' import { updateSelectedSettingsSection } from '../../../redux/actions/appStateActions'; import { withUserAuthorizationPrompt, withErrorBoundary, withReduxProvider } from '../../common/hocs' diff --git a/server/lib/initial-wazuh-config.ts b/server/lib/initial-wazuh-config.ts index fe62ecc5a4..9e99873a11 100644 --- a/server/lib/initial-wazuh-config.ts +++ b/server/lib/initial-wazuh-config.ts @@ -29,7 +29,7 @@ import { WAZUH_STATISTICS_DEFAULT_STATUS, } from '../../common/constants'; import { webDocumentationLink } from '../../common/services/web_documentation'; -import { configEquivalences } from '../../public/utils/config-equivalences'; +import { configEquivalences } from '../../common/config-equivalences'; /** * Given a string, this function builds a multine string, each line about 70