Skip to content

Commit

Permalink
[Enterprise Search] Move views into separate folder from components (#…
Browse files Browse the repository at this point in the history
…75906) (#75933)

* Move views into separate folder from components

* Fix paths in tests

* More error_state to views
  • Loading branch information
scottybollinger authored Aug 26, 2020
1 parent 3874c62 commit d324c6d
Show file tree
Hide file tree
Showing 26 changed files with 16 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import { Redirect } from 'react-router-dom';
import { shallow } from 'enzyme';
import { useValues } from 'kea';

import { Overview } from './components/overview';
import { ErrorState } from './components/error_state';
import { Overview } from './views/overview';
import { ErrorState } from './views/error_state';

import { WorkplaceSearch } from './';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ import { WorkplaceSearchNav } from './components/layout/nav';

import { SETUP_GUIDE_PATH } from './routes';

import { SetupGuide } from './components/setup_guide';
import { ErrorState } from './components/error_state';
import { Overview } from './components/overview';
import { SetupGuide } from './views/setup_guide';
import { ErrorState } from './views/error_state';
import { Overview } from './views/overview';

export const WorkplaceSearch: React.FC<IInitialAppData> = (props) => {
export const WorkplaceSearch: React.FC<IInitialAppData> = () => {
const { config } = useContext(KibanaContext) as IKibanaContext;
const { errorConnecting } = useValues(HttpLogic) as IHttpLogicValues;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { WORKPLACE_SEARCH_PLUGIN } from '../../../../../common/constants';
import { ErrorStatePrompt } from '../../../shared/error_state';
import { SetWorkplaceSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
import { SendWorkplaceSearchTelemetry as SendTelemetry } from '../../../shared/telemetry';
import { ViewContentHeader } from '../shared/view_content_header';
import { ViewContentHeader } from '../../components/shared/view_content_header';

export const ErrorState: React.FC = () => {
return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ import {
EuiButtonEmptyProps,
EuiLinkProps,
} from '@elastic/eui';
import sharedSourcesIcon from '../shared/assets/share_circle.svg';
import sharedSourcesIcon from '../../components/shared/assets/share_circle.svg';
import { sendTelemetry } from '../../../shared/telemetry';
import { KibanaContext, IKibanaContext } from '../../../index';
import { ORG_SOURCES_PATH, USERS_PATH, ORG_SETTINGS_PATH } from '../../routes';

import { ContentSection } from '../shared/content_section';
import { ContentSection } from '../../components/shared/content_section';

import { OverviewLogic, IOverviewValues } from './overview_logic';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { useValues } from 'kea';
import { FormattedMessage } from '@kbn/i18n/react';
import { i18n } from '@kbn/i18n';

import { ContentSection } from '../shared/content_section';
import { ContentSection } from '../../components/shared/content_section';
import { ORG_SOURCES_PATH, USERS_PATH } from '../../routes';

import { OverviewLogic, IOverviewValues } from './overview_logic';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import { mockLogicActions, setMockValues } from './__mocks__';
import React from 'react';
import { shallow, mount } from 'enzyme';

import { Loading } from '../shared/loading';
import { ViewContentHeader } from '../shared/view_content_header';
import { Loading } from '../../components/shared/loading';
import { ViewContentHeader } from '../../components/shared/view_content_header';

import { OnboardingSteps } from './onboarding_steps';
import { OrganizationStats } from './organization_stats';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import { SendWorkplaceSearchTelemetry as SendTelemetry } from '../../../shared/t

import { OverviewLogic, IOverviewActions, IOverviewValues } from './overview_logic';

import { Loading } from '../shared/loading';
import { ProductButton } from '../shared/product_button';
import { ViewContentHeader } from '../shared/view_content_header';
import { Loading } from '../../components/shared/loading';
import { ProductButton } from '../../components/shared/product_button';
import { ViewContentHeader } from '../../components/shared/view_content_header';

import { OnboardingSteps } from './onboarding_steps';
import { OrganizationStats } from './organization_stats';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { useValues } from 'kea';
import { EuiEmptyPrompt, EuiLink, EuiPanel, EuiSpacer, EuiLinkProps } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';

import { ContentSection } from '../shared/content_section';
import { ContentSection } from '../../components/shared/content_section';
import { sendTelemetry } from '../../../shared/telemetry';
import { KibanaContext, IKibanaContext } from '../../../index';
import { getSourcePath } from '../../routes';
Expand Down

0 comments on commit d324c6d

Please sign in to comment.