From e706e0a2e2ce6168ba371a1de8c64bc7abcf49d5 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Thu, 27 Feb 2020 12:37:37 -0500 Subject: [PATCH] update directory structure of schedule list files --- .../Schedule => components}/ScheduleList/ScheduleList.jsx | 2 +- .../Schedule => components}/ScheduleList/ScheduleList.test.jsx | 2 +- .../Schedule => components}/ScheduleList/ScheduleListItem.jsx | 2 +- .../ScheduleList/ScheduleListItem.test.jsx | 0 .../shared => components/ScheduleList}/ScheduleToggle.jsx | 0 .../shared => components/ScheduleList}/ScheduleToggle.test.jsx | 0 .../Schedule => components/ScheduleList}/data.schedules.json | 0 awx/ui_next/src/components/ScheduleList/index.js | 1 + awx/ui_next/src/screens/Schedule/ScheduleList/index.js | 2 -- awx/ui_next/src/screens/Schedule/Schedules.jsx | 2 +- 10 files changed, 5 insertions(+), 6 deletions(-) rename awx/ui_next/src/{screens/Schedule => components}/ScheduleList/ScheduleList.jsx (98%) rename awx/ui_next/src/{screens/Schedule => components}/ScheduleList/ScheduleList.test.jsx (98%) rename awx/ui_next/src/{screens/Schedule => components}/ScheduleList/ScheduleListItem.jsx (98%) rename awx/ui_next/src/{screens/Schedule => components}/ScheduleList/ScheduleListItem.test.jsx (100%) rename awx/ui_next/src/{screens/Schedule/shared => components/ScheduleList}/ScheduleToggle.jsx (100%) rename awx/ui_next/src/{screens/Schedule/shared => components/ScheduleList}/ScheduleToggle.test.jsx (100%) rename awx/ui_next/src/{screens/Schedule => components/ScheduleList}/data.schedules.json (100%) create mode 100644 awx/ui_next/src/components/ScheduleList/index.js delete mode 100644 awx/ui_next/src/screens/Schedule/ScheduleList/index.js diff --git a/awx/ui_next/src/screens/Schedule/ScheduleList/ScheduleList.jsx b/awx/ui_next/src/components/ScheduleList/ScheduleList.jsx similarity index 98% rename from awx/ui_next/src/screens/Schedule/ScheduleList/ScheduleList.jsx rename to awx/ui_next/src/components/ScheduleList/ScheduleList.jsx index 2c1197e7c7..8f8fef3c63 100644 --- a/awx/ui_next/src/screens/Schedule/ScheduleList/ScheduleList.jsx +++ b/awx/ui_next/src/components/ScheduleList/ScheduleList.jsx @@ -12,7 +12,7 @@ import PaginatedDataList, { } from '@components/PaginatedDataList'; import useRequest, { useDeleteItems } from '@util/useRequest'; import { getQSConfig, parseQueryString } from '@util/qs'; -import { ScheduleListItem } from '.'; +import ScheduleListItem from './ScheduleListItem'; const QS_CONFIG = getQSConfig('schedule', { page: 1, diff --git a/awx/ui_next/src/screens/Schedule/ScheduleList/ScheduleList.test.jsx b/awx/ui_next/src/components/ScheduleList/ScheduleList.test.jsx similarity index 98% rename from awx/ui_next/src/screens/Schedule/ScheduleList/ScheduleList.test.jsx rename to awx/ui_next/src/components/ScheduleList/ScheduleList.test.jsx index 706f5f1bca..1528f7888a 100644 --- a/awx/ui_next/src/screens/Schedule/ScheduleList/ScheduleList.test.jsx +++ b/awx/ui_next/src/components/ScheduleList/ScheduleList.test.jsx @@ -3,7 +3,7 @@ import { act } from 'react-dom/test-utils'; import { mountWithContexts } from '@testUtils/enzymeHelpers'; import { SchedulesAPI } from '@api'; import ScheduleList from './ScheduleList'; -import mockSchedules from '../data.schedules.json'; +import mockSchedules from './data.schedules.json'; jest.mock('@api/models/Schedules'); diff --git a/awx/ui_next/src/screens/Schedule/ScheduleList/ScheduleListItem.jsx b/awx/ui_next/src/components/ScheduleList/ScheduleListItem.jsx similarity index 98% rename from awx/ui_next/src/screens/Schedule/ScheduleList/ScheduleListItem.jsx rename to awx/ui_next/src/components/ScheduleList/ScheduleListItem.jsx index 7d34f8b52d..980cecfac5 100644 --- a/awx/ui_next/src/screens/Schedule/ScheduleList/ScheduleListItem.jsx +++ b/awx/ui_next/src/components/ScheduleList/ScheduleListItem.jsx @@ -18,7 +18,7 @@ import { DetailList, Detail } from '@components/DetailList'; import styled from 'styled-components'; import { Schedule } from '@types'; import { formatDateString } from '@util/dates'; -import ScheduleToggle from '../shared/ScheduleToggle'; +import ScheduleToggle from './ScheduleToggle'; const DataListAction = styled(_DataListAction)` align-items: center; diff --git a/awx/ui_next/src/screens/Schedule/ScheduleList/ScheduleListItem.test.jsx b/awx/ui_next/src/components/ScheduleList/ScheduleListItem.test.jsx similarity index 100% rename from awx/ui_next/src/screens/Schedule/ScheduleList/ScheduleListItem.test.jsx rename to awx/ui_next/src/components/ScheduleList/ScheduleListItem.test.jsx diff --git a/awx/ui_next/src/screens/Schedule/shared/ScheduleToggle.jsx b/awx/ui_next/src/components/ScheduleList/ScheduleToggle.jsx similarity index 100% rename from awx/ui_next/src/screens/Schedule/shared/ScheduleToggle.jsx rename to awx/ui_next/src/components/ScheduleList/ScheduleToggle.jsx diff --git a/awx/ui_next/src/screens/Schedule/shared/ScheduleToggle.test.jsx b/awx/ui_next/src/components/ScheduleList/ScheduleToggle.test.jsx similarity index 100% rename from awx/ui_next/src/screens/Schedule/shared/ScheduleToggle.test.jsx rename to awx/ui_next/src/components/ScheduleList/ScheduleToggle.test.jsx diff --git a/awx/ui_next/src/screens/Schedule/data.schedules.json b/awx/ui_next/src/components/ScheduleList/data.schedules.json similarity index 100% rename from awx/ui_next/src/screens/Schedule/data.schedules.json rename to awx/ui_next/src/components/ScheduleList/data.schedules.json diff --git a/awx/ui_next/src/components/ScheduleList/index.js b/awx/ui_next/src/components/ScheduleList/index.js new file mode 100644 index 0000000000..35e4093cba --- /dev/null +++ b/awx/ui_next/src/components/ScheduleList/index.js @@ -0,0 +1 @@ +export { default } from './ScheduleList'; diff --git a/awx/ui_next/src/screens/Schedule/ScheduleList/index.js b/awx/ui_next/src/screens/Schedule/ScheduleList/index.js deleted file mode 100644 index 4f6af384b5..0000000000 --- a/awx/ui_next/src/screens/Schedule/ScheduleList/index.js +++ /dev/null @@ -1,2 +0,0 @@ -export { default as ScheduleList } from './ScheduleList'; -export { default as ScheduleListItem } from './ScheduleListItem'; diff --git a/awx/ui_next/src/screens/Schedule/Schedules.jsx b/awx/ui_next/src/screens/Schedule/Schedules.jsx index 930b115ecd..5e77596993 100644 --- a/awx/ui_next/src/screens/Schedule/Schedules.jsx +++ b/awx/ui_next/src/screens/Schedule/Schedules.jsx @@ -4,7 +4,7 @@ import { withI18n } from '@lingui/react'; import { t } from '@lingui/macro'; import Breadcrumbs from '@components/Breadcrumbs'; -import { ScheduleList } from './ScheduleList'; +import ScheduleList from '@components/ScheduleList'; function Schedules({ i18n }) { return (