[App Search] Minor log retention refactors (#88140)

* Move reused log retention components to own folder - e.g., logic file, helpers used by other views & not just settings * Update settings-specific views to reference top-level folder - I'm leaving the panel and the confirmation modal within settings as that isn't used anywhere outside the settings page, but we can revisit this if needed or if people think it makes more sense to keep everything log related together * [bug] Fix nested <p> error in log retention confirmation modal
elastic · Jan 13, 2021 · 64275cd · 64275cd
1 parent 94ca8ab
commit 64275cd
Show file tree

Hide file tree

Showing 19 changed files with 41 additions and 22 deletions.
diff --git a/...lugins/enterprise_search/public/applications/app_search/components/log_retention/index.ts b/...lugins/enterprise_search/public/applications/app_search/components/log_retention/index.ts
@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { LogRetentionLogic } from './log_retention_logic';
+export * from './types';
+export * from './messaging';
diff --git a/...log_retention/log_retention_logic.test.ts → ...log_retention/log_retention_logic.test.ts b/...log_retention/log_retention_logic.test.ts → ...log_retention/log_retention_logic.test.ts
@@ -4,18 +4,18 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { LogicMounter } from '../../../../__mocks__/kea.mock';
+import { LogicMounter } from '../../../__mocks__/kea.mock';
 
-import { mockHttpValues } from '../../../../__mocks__';
-jest.mock('../../../../shared/http', () => ({
+import { mockHttpValues } from '../../../__mocks__';
+jest.mock('../../../shared/http', () => ({
   HttpLogic: { values: mockHttpValues },
 }));
 const { http } = mockHttpValues;
 
-jest.mock('../../../../shared/flash_messages', () => ({
+jest.mock('../../../shared/flash_messages', () => ({
   flashAPIErrors: jest.fn(),
 }));
-import { flashAPIErrors } from '../../../../shared/flash_messages';
+import { flashAPIErrors } from '../../../shared/flash_messages';
 
 import { LogRetentionOptions } from './types';
 import { LogRetentionLogic } from './log_retention_logic';

diff --git a/...ings/log_retention/log_retention_logic.ts → ...ents/log_retention/log_retention_logic.ts b/...ings/log_retention/log_retention_logic.ts → ...ents/log_retention/log_retention_logic.ts
@@ -6,9 +6,10 @@
 
 import { kea, MakeLogicType } from 'kea';
 
+import { HttpLogic } from '../../../shared/http';
+import { flashAPIErrors } from '../../../shared/flash_messages';
+
 import { LogRetentionOptions, LogRetention, LogRetentionServer } from './types';
-import { HttpLogic } from '../../../../shared/http';
-import { flashAPIErrors } from '../../../../shared/flash_messages';
 import { convertLogRetentionFromServerToClient } from './utils/convert_log_retention';
 
 interface LogRetentionActions {

diff --git a/...ings/log_retention/messaging/constants.ts → ...ents/log_retention/messaging/constants.ts b/...ings/log_retention/messaging/constants.ts → ...ents/log_retention/messaging/constants.ts
diff --git a/...ssaging/determine_tooltip_content.test.ts → ...ssaging/determine_tooltip_content.test.ts b/...ssaging/determine_tooltip_content.test.ts → ...ssaging/determine_tooltip_content.test.ts
diff --git a/...on/messaging/determine_tooltip_content.ts → ...on/messaging/determine_tooltip_content.ts b/...on/messaging/determine_tooltip_content.ts → ...on/messaging/determine_tooltip_content.ts
diff --git a/...gs/log_retention/messaging/index.test.tsx → ...ts/log_retention/messaging/index.test.tsx b/...gs/log_retention/messaging/index.test.tsx → ...ts/log_retention/messaging/index.test.tsx
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import '../../../../../__mocks__/kea.mock';
-import { setMockValues } from '../../../../../__mocks__';
+import '../../../../__mocks__/kea.mock';
+import { setMockValues } from '../../../../__mocks__';
 
 import React from 'react';
 import { shallow } from 'enzyme';

diff --git a/...ettings/log_retention/messaging/index.tsx → ...ponents/log_retention/messaging/index.tsx b/...ettings/log_retention/messaging/index.tsx → ...ponents/log_retention/messaging/index.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { useValues } from 'kea';
 import moment from 'moment';
 
-import { AppLogic } from '../../../../app_logic';
+import { AppLogic } from '../../../app_logic';
 import { LogRetentionLogic } from '../log_retention_logic';
 import { LogRetentionOptions } from '../types';
 

diff --git a/...settings/log_retention/messaging/types.ts → ...mponents/log_retention/messaging/types.ts b/...settings/log_retention/messaging/types.ts → ...mponents/log_retention/messaging/types.ts
diff --git a/...omponents/settings/log_retention/types.ts → ..._search/components/log_retention/types.ts b/...omponents/settings/log_retention/types.ts → ..._search/components/log_retention/types.ts
diff --git a/...ntion/utils/convert_log_retention.test.ts → ...ntion/utils/convert_log_retention.test.ts b/...ntion/utils/convert_log_retention.test.ts → ...ntion/utils/convert_log_retention.test.ts
@@ -3,6 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+
 import { convertLogRetentionFromServerToClient } from './convert_log_retention';
 
 describe('convertLogRetentionFromServerToClient', () => {

diff --git a/..._retention/utils/convert_log_retention.ts → ..._retention/utils/convert_log_retention.ts b/..._retention/utils/convert_log_retention.ts → ..._retention/utils/convert_log_retention.ts
diff --git a/.../applications/app_search/components/settings/log_retention/generic_confirmation_modal.tsx b/.../applications/app_search/components/settings/log_retention/generic_confirmation_modal.tsx
@@ -55,7 +55,7 @@ export const GenericConfirmationModal: React.FC<GenericConfirmationModalProps> =
           <p>
             <strong>{subheading}</strong>
           </p>
-          <p>{description}</p>
+          {description}
         </EuiText>
         <EuiSpacer />
         <EuiFormRow

diff --git a/...terprise_search/public/applications/app_search/components/settings/log_retention/index.ts b/...terprise_search/public/applications/app_search/components/settings/log_retention/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { LogRetentionPanel } from './log_retention_panel';
+export { LogRetentionConfirmationModal } from './log_retention_confirmation_modal';
diff --git a/...ns/app_search/components/settings/log_retention/log_retention_confirmation_modal.test.tsx b/...ns/app_search/components/settings/log_retention/log_retention_confirmation_modal.test.tsx
@@ -10,9 +10,9 @@ import { setMockActions, setMockValues } from '../../../../__mocks__';
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { LogRetentionConfirmationModal } from './log_retention_confirmation_modal';
-import { LogRetentionOptions } from './types';
+import { LogRetentionOptions } from '../../log_retention';
 import { GenericConfirmationModal } from './generic_confirmation_modal';
+import { LogRetentionConfirmationModal } from './log_retention_confirmation_modal';
 
 describe('<LogRetentionConfirmationModal />', () => {
   const actions = {

diff --git a/...cations/app_search/components/settings/log_retention/log_retention_confirmation_modal.tsx b/...cations/app_search/components/settings/log_retention/log_retention_confirmation_modal.tsx
@@ -10,10 +10,8 @@ import { i18n } from '@kbn/i18n';
 import { EuiTextColor, EuiOverlayMask } from '@elastic/eui';
 import { useActions, useValues } from 'kea';
 
+import { LogRetentionLogic, LogRetentionOptions } from '../../log_retention';
 import { GenericConfirmationModal } from './generic_confirmation_modal';
-import { LogRetentionLogic } from './log_retention_logic';
-
-import { LogRetentionOptions } from './types';
 
 export const LogRetentionConfirmationModal: React.FC = () => {
   const CANNOT_BE_RECOVERED_TEXT = i18n.translate(

diff --git a/...ic/applications/app_search/components/settings/log_retention/log_retention_panel.test.tsx b/...ic/applications/app_search/components/settings/log_retention/log_retention_panel.test.tsx
@@ -12,8 +12,8 @@ import { setMockActions, setMockValues } from '../../../../__mocks__';
 import React from 'react';
 import { shallow } from 'enzyme';
 
+import { LogRetention } from '../../log_retention/types';
 import { LogRetentionPanel } from './log_retention_panel';
-import { LogRetention } from './types';
 
 describe('<LogRetentionPanel />', () => {
   const actions = {

diff --git a/.../public/applications/app_search/components/settings/log_retention/log_retention_panel.tsx b/.../public/applications/app_search/components/settings/log_retention/log_retention_panel.tsx
@@ -12,9 +12,12 @@ import { useActions, useValues } from 'kea';
 
 import { DOCS_PREFIX } from '../../../routes';
 
-import { LogRetentionLogic } from './log_retention_logic';
-import { AnalyticsLogRetentionMessage, ApiLogRetentionMessage } from './messaging';
-import { LogRetentionOptions } from './types';
+import {
+  LogRetentionLogic,
+  LogRetentionOptions,
+  AnalyticsLogRetentionMessage,
+  ApiLogRetentionMessage,
+} from '../../log_retention';
 
 export const LogRetentionPanel: React.FC = () => {
   const { toggleLogRetention, fetchLogRetention } = useActions(LogRetentionLogic);

diff --git a/...plugins/enterprise_search/public/applications/app_search/components/settings/settings.tsx b/...plugins/enterprise_search/public/applications/app_search/components/settings/settings.tsx
@@ -16,9 +16,8 @@ import {
 
 import { SetAppSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
 import { FlashMessages } from '../../../shared/flash_messages';
-import { LogRetentionPanel } from './log_retention/log_retention_panel';
-import { LogRetentionConfirmationModal } from './log_retention/log_retention_confirmation_modal';
 
+import { LogRetentionPanel, LogRetentionConfirmationModal } from './log_retention';
 import { SETTINGS_TITLE } from './';
 
 export const Settings: React.FC = () => {