From ef5ce0b08207587add3071e05b5cf33ab7d2d551 Mon Sep 17 00:00:00 2001 From: Alex Corey Date: Thu, 12 Dec 2019 15:42:36 -0500 Subject: [PATCH] Flattens Inventory File Structure Remove --- awx/ui_next/src/index.jsx | 4 ++-- .../{InventoryGroups => }/InventoryGroup/InventoryGroup.jsx | 0 .../InventoryGroup/InventoryGroup.test.jsx | 0 .../Inventory/{InventoryGroups => }/InventoryGroup/index.js | 0 .../InventoryGroupAdd/InventoryGroupAdd.jsx | 0 .../InventoryGroupAdd/InventoryGroupAdd.test.jsx | 0 .../{InventoryGroups => }/InventoryGroupAdd/index.js | 0 .../InventoryGroupDetail/InventoryGroupDetail.jsx | 4 ++-- .../InventoryGroupDetail/InventoryGroupDetail.test.jsx | 0 .../{InventoryGroups => }/InventoryGroupDetail/index.js | 0 .../InventoryGroupEdit/InventoryGroupEdit.jsx | 0 .../InventoryGroupEdit/InventoryGroupEdit.test.jsx | 0 .../{InventoryGroups => }/InventoryGroupEdit/index.js | 0 .../InventoryGroupForm/InventoryGroupForm.jsx | 0 .../InventoryGroupForm/InventoryGroupForm.test.jsx | 0 .../{InventoryGroups => }/InventoryGroupForm/index.js | 0 .../src/screens/Inventory/InventoryGroups/InventoryGroups.jsx | 4 ++-- 17 files changed, 6 insertions(+), 6 deletions(-) rename awx/ui_next/src/screens/Inventory/{InventoryGroups => }/InventoryGroup/InventoryGroup.jsx (100%) rename awx/ui_next/src/screens/Inventory/{InventoryGroups => }/InventoryGroup/InventoryGroup.test.jsx (100%) rename awx/ui_next/src/screens/Inventory/{InventoryGroups => }/InventoryGroup/index.js (100%) rename awx/ui_next/src/screens/Inventory/{InventoryGroups => }/InventoryGroupAdd/InventoryGroupAdd.jsx (100%) rename awx/ui_next/src/screens/Inventory/{InventoryGroups => }/InventoryGroupAdd/InventoryGroupAdd.test.jsx (100%) rename awx/ui_next/src/screens/Inventory/{InventoryGroups => }/InventoryGroupAdd/index.js (100%) rename awx/ui_next/src/screens/Inventory/{InventoryGroups => }/InventoryGroupDetail/InventoryGroupDetail.jsx (96%) rename awx/ui_next/src/screens/Inventory/{InventoryGroups => }/InventoryGroupDetail/InventoryGroupDetail.test.jsx (100%) rename awx/ui_next/src/screens/Inventory/{InventoryGroups => }/InventoryGroupDetail/index.js (100%) rename awx/ui_next/src/screens/Inventory/{InventoryGroups => }/InventoryGroupEdit/InventoryGroupEdit.jsx (100%) rename awx/ui_next/src/screens/Inventory/{InventoryGroups => }/InventoryGroupEdit/InventoryGroupEdit.test.jsx (100%) rename awx/ui_next/src/screens/Inventory/{InventoryGroups => }/InventoryGroupEdit/index.js (100%) rename awx/ui_next/src/screens/Inventory/{InventoryGroups => }/InventoryGroupForm/InventoryGroupForm.jsx (100%) rename awx/ui_next/src/screens/Inventory/{InventoryGroups => }/InventoryGroupForm/InventoryGroupForm.test.jsx (100%) rename awx/ui_next/src/screens/Inventory/{InventoryGroups => }/InventoryGroupForm/index.js (100%) diff --git a/awx/ui_next/src/index.jsx b/awx/ui_next/src/index.jsx index 9227e6e7e3..06d5245d81 100644 --- a/awx/ui_next/src/index.jsx +++ b/awx/ui_next/src/index.jsx @@ -15,7 +15,7 @@ import CredentialTypes from '@screens/CredentialType'; import Dashboard from '@screens/Dashboard'; import Hosts from '@screens/Host'; import InstanceGroups from '@screens/InstanceGroup'; -import Inventories from '@screens/Inventory'; +import Inventory from '@screens/Inventory'; import InventoryScripts from '@screens/InventoryScript'; import { Jobs } from '@screens/Job'; import Login from '@screens/Login'; @@ -139,7 +139,7 @@ export function main(render) { { title: i18n._(t`Inventories`), path: '/inventories', - component: Inventories, + component: Inventory, }, { title: i18n._(t`Hosts`), diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroup/InventoryGroup.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroup/InventoryGroup.jsx similarity index 100% rename from awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroup/InventoryGroup.jsx rename to awx/ui_next/src/screens/Inventory/InventoryGroup/InventoryGroup.jsx diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroup/InventoryGroup.test.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroup/InventoryGroup.test.jsx similarity index 100% rename from awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroup/InventoryGroup.test.jsx rename to awx/ui_next/src/screens/Inventory/InventoryGroup/InventoryGroup.test.jsx diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroup/index.js b/awx/ui_next/src/screens/Inventory/InventoryGroup/index.js similarity index 100% rename from awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroup/index.js rename to awx/ui_next/src/screens/Inventory/InventoryGroup/index.js diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupAdd/InventoryGroupAdd.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroupAdd/InventoryGroupAdd.jsx similarity index 100% rename from awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupAdd/InventoryGroupAdd.jsx rename to awx/ui_next/src/screens/Inventory/InventoryGroupAdd/InventoryGroupAdd.jsx diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupAdd/InventoryGroupAdd.test.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroupAdd/InventoryGroupAdd.test.jsx similarity index 100% rename from awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupAdd/InventoryGroupAdd.test.jsx rename to awx/ui_next/src/screens/Inventory/InventoryGroupAdd/InventoryGroupAdd.test.jsx diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupAdd/index.js b/awx/ui_next/src/screens/Inventory/InventoryGroupAdd/index.js similarity index 100% rename from awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupAdd/index.js rename to awx/ui_next/src/screens/Inventory/InventoryGroupAdd/index.js diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupDetail/InventoryGroupDetail.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroupDetail/InventoryGroupDetail.jsx similarity index 96% rename from awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupDetail/InventoryGroupDetail.jsx rename to awx/ui_next/src/screens/Inventory/InventoryGroupDetail/InventoryGroupDetail.jsx index 20d99538b8..28b662e2ee 100644 --- a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupDetail/InventoryGroupDetail.jsx +++ b/awx/ui_next/src/screens/Inventory/InventoryGroupDetail/InventoryGroupDetail.jsx @@ -57,7 +57,7 @@ function InventoryGroupDetail({ i18n, history, match, inventoryGroup }) { ); } else { - createdBy = i18n._(t`${formatDateString(inventoryGroup.created)} by`); + createdBy = formatDateString(inventoryGroup.created); } } @@ -71,7 +71,7 @@ function InventoryGroupDetail({ i18n, history, match, inventoryGroup }) { ); } else { - modifiedBy = i18n._(t`${formatDateString(inventoryGroup.modified)} by`); + modifiedBy = formatDateString(inventoryGroup.modified); } } diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupDetail/InventoryGroupDetail.test.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroupDetail/InventoryGroupDetail.test.jsx similarity index 100% rename from awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupDetail/InventoryGroupDetail.test.jsx rename to awx/ui_next/src/screens/Inventory/InventoryGroupDetail/InventoryGroupDetail.test.jsx diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupDetail/index.js b/awx/ui_next/src/screens/Inventory/InventoryGroupDetail/index.js similarity index 100% rename from awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupDetail/index.js rename to awx/ui_next/src/screens/Inventory/InventoryGroupDetail/index.js diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupEdit/InventoryGroupEdit.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroupEdit/InventoryGroupEdit.jsx similarity index 100% rename from awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupEdit/InventoryGroupEdit.jsx rename to awx/ui_next/src/screens/Inventory/InventoryGroupEdit/InventoryGroupEdit.jsx diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupEdit/InventoryGroupEdit.test.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroupEdit/InventoryGroupEdit.test.jsx similarity index 100% rename from awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupEdit/InventoryGroupEdit.test.jsx rename to awx/ui_next/src/screens/Inventory/InventoryGroupEdit/InventoryGroupEdit.test.jsx diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupEdit/index.js b/awx/ui_next/src/screens/Inventory/InventoryGroupEdit/index.js similarity index 100% rename from awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupEdit/index.js rename to awx/ui_next/src/screens/Inventory/InventoryGroupEdit/index.js diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupForm/InventoryGroupForm.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroupForm/InventoryGroupForm.jsx similarity index 100% rename from awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupForm/InventoryGroupForm.jsx rename to awx/ui_next/src/screens/Inventory/InventoryGroupForm/InventoryGroupForm.jsx diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupForm/InventoryGroupForm.test.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroupForm/InventoryGroupForm.test.jsx similarity index 100% rename from awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupForm/InventoryGroupForm.test.jsx rename to awx/ui_next/src/screens/Inventory/InventoryGroupForm/InventoryGroupForm.test.jsx diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupForm/index.js b/awx/ui_next/src/screens/Inventory/InventoryGroupForm/index.js similarity index 100% rename from awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupForm/index.js rename to awx/ui_next/src/screens/Inventory/InventoryGroupForm/index.js diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroups.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroups.jsx index e35e2dedb7..2917f3f96d 100644 --- a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroups.jsx +++ b/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroups.jsx @@ -3,9 +3,9 @@ import { withI18n } from '@lingui/react'; import { Switch, Route, withRouter } from 'react-router-dom'; -import InventoryGroupAdd from './InventoryGroupAdd/InventoryGroupAdd'; +import InventoryGroupAdd from '../InventoryGroupAdd/InventoryGroupAdd'; -import InventoryGroup from './InventoryGroup/InventoryGroup'; +import InventoryGroup from '../InventoryGroup/InventoryGroup'; import InventoryGroupsList from './InventoryGroupsList'; function InventoryGroups({ setBreadcrumb, inventory, location, match }) {