diff --git a/plugins/woocommerce-admin/packages/components/src/filters/advanced/README.md b/plugins/woocommerce-admin/packages/components/src/advanced-filters/README.md similarity index 100% rename from plugins/woocommerce-admin/packages/components/src/filters/advanced/README.md rename to plugins/woocommerce-admin/packages/components/src/advanced-filters/README.md diff --git a/plugins/woocommerce-admin/packages/components/src/filters/advanced/date-filter.js b/plugins/woocommerce-admin/packages/components/src/advanced-filters/date-filter.js similarity index 99% rename from plugins/woocommerce-admin/packages/components/src/filters/advanced/date-filter.js rename to plugins/woocommerce-admin/packages/components/src/advanced-filters/date-filter.js index 68cbb5f0db9..1133595da96 100644 --- a/plugins/woocommerce-admin/packages/components/src/filters/advanced/date-filter.js +++ b/plugins/woocommerce-admin/packages/components/src/advanced-filters/date-filter.js @@ -17,7 +17,7 @@ import { isoDateFormat, toMoment } from '@woocommerce/date'; /** * Internal dependencies */ -import DatePicker from '../../calendar/date-picker'; +import DatePicker from '../calendar/date-picker'; import { textContent } from './utils'; import moment from 'moment'; diff --git a/plugins/woocommerce-admin/packages/components/src/filters/advanced/index.js b/plugins/woocommerce-admin/packages/components/src/advanced-filters/index.js similarity index 99% rename from plugins/woocommerce-admin/packages/components/src/filters/advanced/index.js rename to plugins/woocommerce-admin/packages/components/src/advanced-filters/index.js index 8b4ad3a36e6..70b6b919b36 100644 --- a/plugins/woocommerce-admin/packages/components/src/filters/advanced/index.js +++ b/plugins/woocommerce-admin/packages/components/src/advanced-filters/index.js @@ -25,8 +25,8 @@ import { /** * Internal dependencies */ -import Card from '../../card'; -import Link from '../../link'; +import Card from '../card'; +import Link from '../link'; import SelectFilter from './select-filter'; import SearchFilter from './search-filter'; import NumberFilter from './number-filter'; diff --git a/plugins/woocommerce-admin/packages/components/src/filters/advanced/number-filter.js b/plugins/woocommerce-admin/packages/components/src/advanced-filters/number-filter.js similarity index 99% rename from plugins/woocommerce-admin/packages/components/src/filters/advanced/number-filter.js rename to plugins/woocommerce-admin/packages/components/src/advanced-filters/number-filter.js index 6f690485fa8..c4002fda2a6 100644 --- a/plugins/woocommerce-admin/packages/components/src/filters/advanced/number-filter.js +++ b/plugins/woocommerce-admin/packages/components/src/advanced-filters/number-filter.js @@ -12,7 +12,7 @@ import { sprintf, __, _x } from '@wordpress/i18n'; /** * Internal dependencies */ -import TextControlWithAffixes from '../../text-control-with-affixes'; +import TextControlWithAffixes from '../text-control-with-affixes'; import { textContent } from './utils'; /** diff --git a/plugins/woocommerce-admin/packages/components/src/filters/advanced/search-filter.js b/plugins/woocommerce-admin/packages/components/src/advanced-filters/search-filter.js similarity index 99% rename from plugins/woocommerce-admin/packages/components/src/filters/advanced/search-filter.js rename to plugins/woocommerce-admin/packages/components/src/advanced-filters/search-filter.js index 550c0af1094..292fccd7b8b 100644 --- a/plugins/woocommerce-admin/packages/components/src/filters/advanced/search-filter.js +++ b/plugins/woocommerce-admin/packages/components/src/advanced-filters/search-filter.js @@ -13,7 +13,7 @@ import classnames from 'classnames'; /** * Internal dependencies */ -import Search from '../../search'; +import Search from '../search'; import { textContent } from './utils'; class SearchFilter extends Component { diff --git a/plugins/woocommerce-admin/packages/components/src/filters/advanced/select-filter.js b/plugins/woocommerce-admin/packages/components/src/advanced-filters/select-filter.js similarity index 100% rename from plugins/woocommerce-admin/packages/components/src/filters/advanced/select-filter.js rename to plugins/woocommerce-admin/packages/components/src/advanced-filters/select-filter.js diff --git a/plugins/woocommerce-admin/packages/components/src/filters/advanced/style.scss b/plugins/woocommerce-admin/packages/components/src/advanced-filters/style.scss similarity index 100% rename from plugins/woocommerce-admin/packages/components/src/filters/advanced/style.scss rename to plugins/woocommerce-admin/packages/components/src/advanced-filters/style.scss diff --git a/plugins/woocommerce-admin/packages/components/src/filters/advanced/test/utils.js b/plugins/woocommerce-admin/packages/components/src/advanced-filters/test/utils.js similarity index 100% rename from plugins/woocommerce-admin/packages/components/src/filters/advanced/test/utils.js rename to plugins/woocommerce-admin/packages/components/src/advanced-filters/test/utils.js diff --git a/plugins/woocommerce-admin/packages/components/src/filters/advanced/utils.js b/plugins/woocommerce-admin/packages/components/src/advanced-filters/utils.js similarity index 100% rename from plugins/woocommerce-admin/packages/components/src/filters/advanced/utils.js rename to plugins/woocommerce-admin/packages/components/src/advanced-filters/utils.js diff --git a/plugins/woocommerce-admin/packages/components/src/filters/compare/button.js b/plugins/woocommerce-admin/packages/components/src/compare-filter/button.js similarity index 100% rename from plugins/woocommerce-admin/packages/components/src/filters/compare/button.js rename to plugins/woocommerce-admin/packages/components/src/compare-filter/button.js diff --git a/plugins/woocommerce-admin/packages/components/src/filters/compare/index.js b/plugins/woocommerce-admin/packages/components/src/compare-filter/index.js similarity index 98% rename from plugins/woocommerce-admin/packages/components/src/filters/compare/index.js rename to plugins/woocommerce-admin/packages/components/src/compare-filter/index.js index b91d3bed3c5..c6044810871 100644 --- a/plugins/woocommerce-admin/packages/components/src/filters/compare/index.js +++ b/plugins/woocommerce-admin/packages/components/src/compare-filter/index.js @@ -16,9 +16,9 @@ import { getIdsFromQuery, updateQueryString } from '@woocommerce/navigation'; /** * Internal dependencies */ -import Card from '../../card'; +import Card from '../card'; import CompareButton from './button'; -import Search from '../../search'; +import Search from '../search'; /** * Displays a card + search used to filter results as a comparison between objects. diff --git a/plugins/woocommerce-admin/packages/components/src/filters/date/README.md b/plugins/woocommerce-admin/packages/components/src/date-range-filter-picker/README.md similarity index 100% rename from plugins/woocommerce-admin/packages/components/src/filters/date/README.md rename to plugins/woocommerce-admin/packages/components/src/date-range-filter-picker/README.md diff --git a/plugins/woocommerce-admin/packages/components/src/filters/date/compare-periods.js b/plugins/woocommerce-admin/packages/components/src/date-range-filter-picker/compare-periods.js similarity index 92% rename from plugins/woocommerce-admin/packages/components/src/filters/date/compare-periods.js rename to plugins/woocommerce-admin/packages/components/src/date-range-filter-picker/compare-periods.js index 9c7bb073704..8249f14ddda 100644 --- a/plugins/woocommerce-admin/packages/components/src/filters/date/compare-periods.js +++ b/plugins/woocommerce-admin/packages/components/src/date-range-filter-picker/compare-periods.js @@ -14,7 +14,7 @@ import { periods } from '@woocommerce/date'; /** * Internal dependencies */ -import SegmentedSelection from '../../segmented-selection'; +import SegmentedSelection from '../segmented-selection'; class ComparePeriods extends Component { render() { diff --git a/plugins/woocommerce-admin/packages/components/src/filters/date/content.js b/plugins/woocommerce-admin/packages/components/src/date-range-filter-picker/content.js similarity index 97% rename from plugins/woocommerce-admin/packages/components/src/filters/date/content.js rename to plugins/woocommerce-admin/packages/components/src/date-range-filter-picker/content.js index 36fa506ba87..f73eb6479fc 100644 --- a/plugins/woocommerce-admin/packages/components/src/filters/date/content.js +++ b/plugins/woocommerce-admin/packages/components/src/date-range-filter-picker/content.js @@ -13,8 +13,8 @@ import moment from 'moment'; * Internal dependencies */ import ComparePeriods from './compare-periods'; -import DateRange from '../../calendar/date-range'; -import { H, Section } from '../../section'; +import DateRange from '../calendar/date-range'; +import { H, Section } from '../section'; import PresetPeriods from './preset-periods'; class DatePickerContent extends Component { diff --git a/plugins/woocommerce-admin/packages/components/src/filters/date/index.js b/plugins/woocommerce-admin/packages/components/src/date-range-filter-picker/index.js similarity index 98% rename from plugins/woocommerce-admin/packages/components/src/filters/date/index.js rename to plugins/woocommerce-admin/packages/components/src/date-range-filter-picker/index.js index 633d73d80cf..8a876f0fbf8 100644 --- a/plugins/woocommerce-admin/packages/components/src/filters/date/index.js +++ b/plugins/woocommerce-admin/packages/components/src/date-range-filter-picker/index.js @@ -16,7 +16,7 @@ import { getCurrentDates, getDateParamsFromQuery, isoDateFormat } from '@woocomm * Internal dependencies */ import DatePickerContent from './content'; -import DropdownButton from '../../dropdown-button'; +import DropdownButton from '../dropdown-button'; const shortDateFormat = __( 'MM/DD/YYYY', 'woocommerce-admin' ); diff --git a/plugins/woocommerce-admin/packages/components/src/filters/date/preset-periods.js b/plugins/woocommerce-admin/packages/components/src/date-range-filter-picker/preset-periods.js similarity index 93% rename from plugins/woocommerce-admin/packages/components/src/filters/date/preset-periods.js rename to plugins/woocommerce-admin/packages/components/src/date-range-filter-picker/preset-periods.js index 6d8a5dce3e8..a2aad956f72 100644 --- a/plugins/woocommerce-admin/packages/components/src/filters/date/preset-periods.js +++ b/plugins/woocommerce-admin/packages/components/src/date-range-filter-picker/preset-periods.js @@ -15,7 +15,7 @@ import { presetValues } from '@woocommerce/date'; /** * Internal dependencies */ -import SegmentedSelection from '../../segmented-selection'; +import SegmentedSelection from '../segmented-selection'; class PresetPeriods extends Component { render() { diff --git a/plugins/woocommerce-admin/packages/components/src/filters/date/style.scss b/plugins/woocommerce-admin/packages/components/src/date-range-filter-picker/style.scss similarity index 100% rename from plugins/woocommerce-admin/packages/components/src/filters/date/style.scss rename to plugins/woocommerce-admin/packages/components/src/date-range-filter-picker/style.scss diff --git a/plugins/woocommerce-admin/packages/components/src/filters/filter/README.md b/plugins/woocommerce-admin/packages/components/src/filter-picker/README.md similarity index 100% rename from plugins/woocommerce-admin/packages/components/src/filters/filter/README.md rename to plugins/woocommerce-admin/packages/components/src/filter-picker/README.md diff --git a/plugins/woocommerce-admin/packages/components/src/filters/filter/index.js b/plugins/woocommerce-admin/packages/components/src/filter-picker/index.js similarity index 98% rename from plugins/woocommerce-admin/packages/components/src/filters/filter/index.js rename to plugins/woocommerce-admin/packages/components/src/filter-picker/index.js index ca62e56cee4..139d41b5678 100644 --- a/plugins/woocommerce-admin/packages/components/src/filters/filter/index.js +++ b/plugins/woocommerce-admin/packages/components/src/filter-picker/index.js @@ -18,9 +18,9 @@ import { flattenFilters, getPersistedQuery, updateQueryString } from '@woocommer /** * Internal dependencies */ -import AnimationSlider from '../../animation-slider'; -import DropdownButton from '../../dropdown-button'; -import Search from '../../search'; +import AnimationSlider from '../animation-slider'; +import DropdownButton from '../dropdown-button'; +import Search from '../search'; export const DEFAULT_FILTER = 'all'; diff --git a/plugins/woocommerce-admin/packages/components/src/filters/filter/style.scss b/plugins/woocommerce-admin/packages/components/src/filter-picker/style.scss similarity index 100% rename from plugins/woocommerce-admin/packages/components/src/filters/filter/style.scss rename to plugins/woocommerce-admin/packages/components/src/filter-picker/style.scss diff --git a/plugins/woocommerce-admin/packages/components/src/filters/index.js b/plugins/woocommerce-admin/packages/components/src/filters/index.js index 1c651fa52c9..ebb317c119f 100644 --- a/plugins/woocommerce-admin/packages/components/src/filters/index.js +++ b/plugins/woocommerce-admin/packages/components/src/filters/index.js @@ -15,10 +15,10 @@ import { updateQueryString } from '@woocommerce/navigation'; /** * Internal dependencies */ -import AdvancedFilters from './advanced'; -import CompareFilter from './compare'; -import DateRangeFilterPicker from './date'; -import FilterPicker from './filter'; +import AdvancedFilters from '../advanced-filters'; +import CompareFilter from '../compare-filter'; +import DateRangeFilterPicker from '../date-range-filter-picker'; +import FilterPicker from '../filter-picker'; import { H, Section } from '../section'; /** diff --git a/plugins/woocommerce-admin/packages/components/src/index.js b/plugins/woocommerce-admin/packages/components/src/index.js index 4174239687b..6183a3f41bd 100644 --- a/plugins/woocommerce-admin/packages/components/src/index.js +++ b/plugins/woocommerce-admin/packages/components/src/index.js @@ -5,16 +5,16 @@ // Turn on react-dates classes/styles, see https://github.com/airbnb/react-dates#initialize import 'react-dates/initialize'; -export { default as AdvancedFilters } from './filters/advanced'; +export { default as AdvancedFilters } from './advanced-filters'; export { default as AnimationSlider } from './animation-slider'; export { default as Autocomplete } from './autocomplete'; export { default as Chart } from './chart'; export { default as ChartPlaceholder } from './chart/placeholder'; export { default as Card } from './card'; export { default as Count } from './count'; -export { default as CompareFilter } from './filters/compare'; +export { default as CompareFilter } from './compare-filter'; export { default as Date } from './date'; -export { default as DateRangeFilterPicker } from './filters/date'; +export { default as DateRangeFilterPicker } from './date-range-filter-picker'; export { default as DateRange } from './calendar/date-range'; export { default as DatePicker } from './calendar/date-picker'; export { default as DropdownButton } from './dropdown-button'; @@ -22,7 +22,7 @@ export { default as EllipsisMenu } from './ellipsis-menu'; export { default as EmptyContent } from './empty-content'; export { default as Flag } from './flag'; export { default as Form } from './form'; -export { default as FilterPicker } from './filters/filter'; +export { default as FilterPicker } from './filter-picker'; export { default as Gravatar } from './gravatar'; export { H, Section } from './section'; export { default as ImageAsset } from './image-asset'; diff --git a/plugins/woocommerce-admin/packages/components/src/style.scss b/plugins/woocommerce-admin/packages/components/src/style.scss index 88bcd432fe4..48c6a40f8f3 100644 --- a/plugins/woocommerce-admin/packages/components/src/style.scss +++ b/plugins/woocommerce-admin/packages/components/src/style.scss @@ -12,9 +12,9 @@ @import 'dropdown-button/style.scss'; @import 'ellipsis-menu/style.scss'; @import 'empty-content/style.scss'; -@import 'filters/advanced/style.scss'; -@import 'filters/date/style.scss'; -@import 'filters/filter/style.scss'; +@import 'advanced-filters/style.scss'; +@import 'date-range-filter-picker/style.scss'; +@import 'filter-picker/style.scss'; @import 'filters/style.scss'; @import 'flag/style.scss'; @import 'gravatar/style.scss'; diff --git a/plugins/woocommerce-admin/packages/components/src/table/index.js b/plugins/woocommerce-admin/packages/components/src/table/index.js index 7e17983b3eb..7306cc6bde7 100644 --- a/plugins/woocommerce-admin/packages/components/src/table/index.js +++ b/plugins/woocommerce-admin/packages/components/src/table/index.js @@ -23,7 +23,7 @@ import { getIdsFromQuery, getSearchWords, updateQueryString } from '@woocommerce * Internal dependencies */ import Card from '../card'; -import CompareButton from '../filters/compare/button'; +import CompareButton from '../compare-filter/button'; import DownloadIcon from './download-icon'; import EllipsisMenu from '../ellipsis-menu'; import MenuItem from '../ellipsis-menu/menu-item';