From 2baabf272c9af93ace140082c9e7bdd0c2df5386 Mon Sep 17 00:00:00 2001 From: Alex P Date: Tue, 26 Jun 2018 17:45:52 -0700 Subject: [PATCH] Move overlay related components to new "Reusable UI" directory --- ui/src/dashboards/components/DashboardsPageContents.tsx | 2 +- ui/src/dashboards/components/ImportDashboardOverlay.tsx | 6 +++--- ui/src/data_explorer/containers/DataExplorer.tsx | 2 +- ui/src/flux/components/FluxHeader.tsx | 2 +- ui/src/flux/containers/CheckServices.tsx | 2 +- .../components/overlays}/OverlayBody.tsx | 0 .../components/overlays}/OverlayContainer.tsx | 0 .../components/overlays}/OverlayHeading.tsx | 0 .../components/overlays}/OverlayTechnology.tsx | 0 ui/src/tempVars/components/TemplateControlBar.tsx | 2 +- ui/src/tempVars/components/TemplateControlDropdown.tsx | 2 +- ui/src/tempVars/components/TemplateVariableEditor.tsx | 6 +++--- ui/test/tempVars/components/TemplateControlBar.test.tsx | 2 +- .../tempVars/components/TemplateControlDropdown.test.tsx | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) rename ui/src/{shared/components/overlay => reusable_ui/components/overlays}/OverlayBody.tsx (100%) rename ui/src/{shared/components/overlay => reusable_ui/components/overlays}/OverlayContainer.tsx (100%) rename ui/src/{shared/components/overlay => reusable_ui/components/overlays}/OverlayHeading.tsx (100%) rename ui/src/{shared/components => reusable_ui/components/overlays}/OverlayTechnology.tsx (100%) diff --git a/ui/src/dashboards/components/DashboardsPageContents.tsx b/ui/src/dashboards/components/DashboardsPageContents.tsx index 60da972d80..f9a73acfeb 100644 --- a/ui/src/dashboards/components/DashboardsPageContents.tsx +++ b/ui/src/dashboards/components/DashboardsPageContents.tsx @@ -7,7 +7,7 @@ import ImportDashboardOverlay from 'src/dashboards/components/ImportDashboardOve import SearchBar from 'src/hosts/components/SearchBar' import FancyScrollbar from 'src/shared/components/FancyScrollbar' import {ErrorHandling} from 'src/shared/decorators/errors' -import OverlayTechnology from 'src/shared/components/OverlayTechnology' +import OverlayTechnology from 'src/reusable_ui/components/overlays/OverlayTechnology' import {Dashboard} from 'src/types' import {Notification} from 'src/types/notifications' diff --git a/ui/src/dashboards/components/ImportDashboardOverlay.tsx b/ui/src/dashboards/components/ImportDashboardOverlay.tsx index c89dba6fc8..502d14e17d 100644 --- a/ui/src/dashboards/components/ImportDashboardOverlay.tsx +++ b/ui/src/dashboards/components/ImportDashboardOverlay.tsx @@ -1,9 +1,9 @@ import React, {PureComponent} from 'react' import _ from 'lodash' -import Container from 'src/shared/components/overlay/OverlayContainer' -import Heading from 'src/shared/components/overlay/OverlayHeading' -import Body from 'src/shared/components/overlay/OverlayBody' +import Container from 'src/reusable_ui/components/overlays/OverlayContainer' +import Heading from 'src/reusable_ui/components/overlays/OverlayHeading' +import Body from 'src/reusable_ui/components/overlays/OverlayBody' import DragAndDrop from 'src/shared/components/DragAndDrop' import {notifyDashboardImportFailed} from 'src/shared/copy/notifications' diff --git a/ui/src/data_explorer/containers/DataExplorer.tsx b/ui/src/data_explorer/containers/DataExplorer.tsx index 78c739d990..5518fd0fd8 100644 --- a/ui/src/data_explorer/containers/DataExplorer.tsx +++ b/ui/src/data_explorer/containers/DataExplorer.tsx @@ -13,7 +13,7 @@ import QueryMaker from 'src/data_explorer/components/QueryMaker' import Visualization from 'src/data_explorer/components/Visualization' import WriteDataForm from 'src/data_explorer/components/WriteDataForm' import ResizeContainer from 'src/shared/components/ResizeContainer' -import OverlayTechnology from 'src/shared/components/OverlayTechnology' +import OverlayTechnology from 'src/reusable_ui/components/overlays/OverlayTechnology' import ManualRefresh from 'src/shared/components/ManualRefresh' import AutoRefreshDropdown from 'src/shared/components/AutoRefreshDropdown' import TimeRangeDropdown from 'src/shared/components/TimeRangeDropdown' diff --git a/ui/src/flux/components/FluxHeader.tsx b/ui/src/flux/components/FluxHeader.tsx index 5616dcf128..7df444c17d 100644 --- a/ui/src/flux/components/FluxHeader.tsx +++ b/ui/src/flux/components/FluxHeader.tsx @@ -1,7 +1,7 @@ import React, {PureComponent} from 'react' import FluxOverlay from 'src/flux/components/FluxOverlay' -import OverlayTechnology from 'src/shared/components/OverlayTechnology' +import OverlayTechnology from 'src/reusable_ui/components/overlays/OverlayTechnology' import PageHeader from 'src/shared/components/PageHeader' import {Service} from 'src/types' diff --git a/ui/src/flux/containers/CheckServices.tsx b/ui/src/flux/containers/CheckServices.tsx index e00d6c7a37..246e0427ab 100644 --- a/ui/src/flux/containers/CheckServices.tsx +++ b/ui/src/flux/containers/CheckServices.tsx @@ -4,7 +4,7 @@ import {WithRouterProps} from 'react-router' import {FluxPage} from 'src/flux' import FluxOverlay from 'src/flux/components/FluxOverlay' -import OverlayTechnology from 'src/shared/components/OverlayTechnology' +import OverlayTechnology from 'src/reusable_ui/components/overlays/OverlayTechnology' import {Source, Service, Notification} from 'src/types' import {Links} from 'src/types/flux' import {notify as notifyAction} from 'src/shared/actions/notifications' diff --git a/ui/src/shared/components/overlay/OverlayBody.tsx b/ui/src/reusable_ui/components/overlays/OverlayBody.tsx similarity index 100% rename from ui/src/shared/components/overlay/OverlayBody.tsx rename to ui/src/reusable_ui/components/overlays/OverlayBody.tsx diff --git a/ui/src/shared/components/overlay/OverlayContainer.tsx b/ui/src/reusable_ui/components/overlays/OverlayContainer.tsx similarity index 100% rename from ui/src/shared/components/overlay/OverlayContainer.tsx rename to ui/src/reusable_ui/components/overlays/OverlayContainer.tsx diff --git a/ui/src/shared/components/overlay/OverlayHeading.tsx b/ui/src/reusable_ui/components/overlays/OverlayHeading.tsx similarity index 100% rename from ui/src/shared/components/overlay/OverlayHeading.tsx rename to ui/src/reusable_ui/components/overlays/OverlayHeading.tsx diff --git a/ui/src/shared/components/OverlayTechnology.tsx b/ui/src/reusable_ui/components/overlays/OverlayTechnology.tsx similarity index 100% rename from ui/src/shared/components/OverlayTechnology.tsx rename to ui/src/reusable_ui/components/overlays/OverlayTechnology.tsx diff --git a/ui/src/tempVars/components/TemplateControlBar.tsx b/ui/src/tempVars/components/TemplateControlBar.tsx index df4ed49883..f8e202f4d0 100644 --- a/ui/src/tempVars/components/TemplateControlBar.tsx +++ b/ui/src/tempVars/components/TemplateControlBar.tsx @@ -2,7 +2,7 @@ import React, {Component} from 'react' import classnames from 'classnames' import TemplateControlDropdown from 'src/tempVars/components/TemplateControlDropdown' -import OverlayTechnology from 'src/shared/components/OverlayTechnology' +import OverlayTechnology from 'src/reusable_ui/components/overlays/OverlayTechnology' import TemplateVariableEditor from 'src/tempVars/components/TemplateVariableEditor' import Authorized, {EDITOR_ROLE} from 'src/auth/Authorized' diff --git a/ui/src/tempVars/components/TemplateControlDropdown.tsx b/ui/src/tempVars/components/TemplateControlDropdown.tsx index d71f90d55f..e391ceb496 100644 --- a/ui/src/tempVars/components/TemplateControlDropdown.tsx +++ b/ui/src/tempVars/components/TemplateControlDropdown.tsx @@ -1,7 +1,7 @@ import React, {PureComponent} from 'react' import Dropdown from 'src/shared/components/Dropdown' -import OverlayTechnology from 'src/shared/components/OverlayTechnology' +import OverlayTechnology from 'src/reusable_ui/components/overlays/OverlayTechnology' import TemplateVariableEditor from 'src/tempVars/components/TemplateVariableEditor' import {calculateDropdownWidth} from 'src/dashboards/constants/templateControlBar' import Authorized, {isUserAuthorized, EDITOR_ROLE} from 'src/auth/Authorized' diff --git a/ui/src/tempVars/components/TemplateVariableEditor.tsx b/ui/src/tempVars/components/TemplateVariableEditor.tsx index c37981338d..9161fd9ef8 100644 --- a/ui/src/tempVars/components/TemplateVariableEditor.tsx +++ b/ui/src/tempVars/components/TemplateVariableEditor.tsx @@ -7,9 +7,9 @@ import React, { import {connect} from 'react-redux' import {ErrorHandling} from 'src/shared/decorators/errors' -import OverlayContainer from 'src/shared/components/overlay/OverlayContainer' -import OverlayHeading from 'src/shared/components/overlay/OverlayHeading' -import OverlayBody from 'src/shared/components/overlay/OverlayBody' +import OverlayContainer from 'src/reusable_ui/components/overlays/OverlayContainer' +import OverlayHeading from 'src/reusable_ui/components/overlays/OverlayHeading' +import OverlayBody from 'src/reusable_ui/components/overlays/OverlayBody' import Dropdown from 'src/shared/components/Dropdown' import ConfirmButton from 'src/shared/components/ConfirmButton' import {getDeep} from 'src/utils/wrappers' diff --git a/ui/test/tempVars/components/TemplateControlBar.test.tsx b/ui/test/tempVars/components/TemplateControlBar.test.tsx index 7bf02b58ea..8d2ca425b7 100644 --- a/ui/test/tempVars/components/TemplateControlBar.test.tsx +++ b/ui/test/tempVars/components/TemplateControlBar.test.tsx @@ -4,7 +4,7 @@ import {shallow} from 'enzyme' import TemplateControlBar from 'src/tempVars/components/TemplateControlBar' import TemplateControlDropdown from 'src/tempVars/components/TemplateControlDropdown' import TemplateVariableEditor from 'src/tempVars/components/TemplateVariableEditor' -import OverlayTechnology from 'src/shared/components/OverlayTechnology' +import OverlayTechnology from 'src/reusable_ui/components/overlays/OverlayTechnology' import {source} from 'test/resources' import {TemplateType, TemplateValueType} from 'src/types' diff --git a/ui/test/tempVars/components/TemplateControlDropdown.test.tsx b/ui/test/tempVars/components/TemplateControlDropdown.test.tsx index 25416edafd..0ae59230d6 100644 --- a/ui/test/tempVars/components/TemplateControlDropdown.test.tsx +++ b/ui/test/tempVars/components/TemplateControlDropdown.test.tsx @@ -1,7 +1,7 @@ import React from 'react' import {shallow} from 'enzyme' -import OverlayTechnology from 'src/shared/components/OverlayTechnology' +import OverlayTechnology from 'src/reusable_ui/components/overlays/OverlayTechnology' import TemplateVariableEditor from 'src/tempVars/components/TemplateVariableEditor' import TemplateControlDropdown from 'src/tempVars/components/TemplateControlDropdown' import {source} from 'test/resources'