From 92c9b786f4145f58a78e51c18a6038d6f5e540d1 Mon Sep 17 00:00:00 2001 From: Michael Abashian Date: Tue, 20 Jun 2017 17:27:23 -0400 Subject: [PATCH 1/3] Removed copy/move in favor of associate and disassociate. Re-organized the inventories directory. --- .../factories/build-anchor.factory.js | 6 +- awx/ui/client/src/app.js | 4 +- .../hosts/edit/host-edit.controller.js | 6 +- .../hosts/edit/main.js | 0 .../hosts/host.form.js | 0 .../hosts/host.list.js | 0 .../hosts/hosts.partial.html | 0 .../hosts/list/host-list.controller.js | 8 +- .../hosts/list/main.js | 0 .../src/inventories-hosts/hosts/main.js | 112 ++++++++++ .../hosts-related-groups-associate.route.js | 33 +++ .../hosts-related-groups.controller.js} | 16 +- .../groups/hosts-related-groups.list.js} | 2 +- .../groups/hosts-related-groups.partial.html} | 5 +- .../groups/hosts-related-groups.route.js} | 22 +- .../hosts/related/groups/main.js | 14 ++ .../adhoc/adhoc-credential.route.js | 0 .../inventories/adhoc/adhoc.controller.js | 0 .../inventories/adhoc/adhoc.form.js | 0 .../inventories/adhoc/adhoc.partial.html | 0 .../inventories/adhoc/adhoc.route.js | 6 +- .../inventories/adhoc/main.js | 0 .../inventories/insights/insights.block.less | 2 +- .../insights/insights.controller.js | 0 .../insights/insights.partial.html | 0 .../inventories/insights/insights.route.js | 6 +- .../inventories/insights/insights.service.js | 0 .../inventories/insights/main.js | 0 .../inventories/insights/plan-filter.js | 0 .../inventories/inventories.block.less | 0 .../inventories/inventories.partial.html | 1 - .../inventories/inventories.route.js | 6 +- .../inventories/inventory.list.js | 0 .../host-summary-popover.block.less | 0 .../host-summary-popover.controller.js | 0 .../host-summary-popover.directive.js | 2 +- .../host-summary-popover.partial.html | 0 .../list/host-summary-popover/main.js | 0 .../list/inventory-list.controller.js | 0 .../inventories/list/main.js | 0 .../list/source-summary-popover/main.js | 0 .../source-summary-popover.controller.js | 0 .../source-summary-popover.directive.js | 2 +- .../source-summary-popover.partial.html | 0 .../inventories/main.js | 204 ++++-------------- .../completed-jobs/completed-jobs.list.js} | 0 .../completed-jobs/completed-jobs.route.js} | 2 +- .../related/completed-jobs}/main.js | 2 +- .../groups/add/groups-add.controller.js | 8 +- .../related}/groups/add/groups-add.route.js | 2 +- .../inventories/related}/groups/add/main.js | 0 .../groups/edit/groups-edit.controller.js | 6 +- .../related}/groups/edit/groups-edit.route.js | 4 +- .../inventories/related}/groups/edit/main.js | 0 .../factories/get-hosts-status-msg.factory.js | 0 .../related}/groups/groups.form.js | 0 .../related}/groups/groups.list.js | 39 +--- .../groups/list/groups-list.controller.js | 14 +- .../groups/list/groups-list.partial.html | 0 .../related}/groups/list/groups-list.route.js | 10 +- .../inventories/related}/groups/list/main.js | 0 .../inventories/related}/groups/main.js | 8 +- .../group-nested-groups-add.controller.js} | 8 +- .../group-nested-groups-add.route.js} | 2 +- .../group-nested-groups-associate.route.js | 33 +++ ...up-nested-groups-disassociate.partial.html | 35 +++ .../group-nested-groups-list.controller.js} | 52 ++++- .../group-nested-groups.form.js} | 0 .../group-nested-groups.list.js} | 61 ++---- .../group-nested-groups.route.js} | 28 ++- .../groups/related}/nested-groups/main.js | 10 +- .../group-nested-hosts-add.controller.js | 52 +++++ .../group-nested-hosts-add.route.js} | 4 +- .../group-nested-hosts-associate.route.js | 33 +++ ...oup-nested-hosts-disassociate.partial.html | 35 +++ .../group-nested-hosts-list.controller.js} | 77 +++---- .../nested-hosts/group-nested-hosts.form.js} | 7 - .../nested-hosts/group-nested-hosts.list.js} | 49 +++-- .../nested-hosts/group-nested-hosts.route.js} | 17 +- .../groups/related}/nested-hosts/main.js | 8 +- .../related/hosts}/add/host-add.controller.js | 15 +- .../related/hosts}/add/host-add.route.js | 2 +- .../inventories/related/hosts}/add/main.js | 0 .../hosts}/edit/host-edit.controller.js | 6 +- .../related/hosts}/edit/host-edit.route.js | 9 +- .../inventories/related/hosts}/edit/main.js | 0 .../hosts}/list/host-list.controller.js | 14 +- .../inventories/related/hosts}/list/main.js | 0 .../inventories/related/hosts}/main.js | 4 +- .../hosts}/related-groups-labels/main.js | 0 .../relatedGroupsLabelsList.block.less | 0 .../relatedGroupsLabelsList.directive.js | 2 +- .../relatedGroupsLabelsList.partial.html | 0 .../related/hosts}/related-host.form.js | 0 .../related/hosts}/related-host.list.js | 7 - .../related/hosts}/related-host.route.js | 12 +- .../host-nested-groups-associate.route.js | 33 +++ ...st-nested-groups-disassociate.partial.html | 35 +++ .../host-nested-groups-list.controller.js | 122 +++++++++++ .../nested-groups/host-nested-groups.list.js | 107 +++++++++ .../nested-groups/host-nested-groups.route.js | 79 +++++++ .../hosts/related/nested-groups/main.js | 13 ++ .../inventories/related}/sources/add/main.js | 0 .../sources/add/sources-add.controller.js | 4 +- .../related}/sources/add/sources-add.route.js | 6 +- .../inventories/related}/sources/edit/main.js | 0 .../sources/edit/sources-edit.controller.js | 4 +- .../sources/edit/sources-edit.route.js | 6 +- .../edit/sources-notifications.route.js | 2 +- .../factories/cancel-source-update.factory.js | 0 .../get-source-type-options.factory.js | 0 .../factories/get-sync-status-msg.factory.js | 0 .../factories/view-update-status.factory.js | 0 .../inventories/related}/sources/list/main.js | 0 .../schedule/sources-schedule-add.route.js | 4 +- .../schedule/sources-schedule-edit.route.js | 2 +- .../list/schedule/sources-schedule.route.js | 2 +- .../sources/list/sources-list.controller.js | 0 .../sources/list/sources-list.partial.html | 0 .../sources/list/sources-list.route.js | 14 +- .../lookup/sources-lookup-credential.route.js | 0 .../sources-lookup-inventory-script.route.js | 6 +- .../lookup/sources-lookup-project.route.js | 0 .../inventories/related}/sources/main.js | 0 .../related}/sources/sources.form.js | 0 .../related}/sources/sources.list.js | 7 - .../related}/sources/sources.service.js | 0 .../inventories/smart-inventory/add/main.js | 0 .../add/smart-inventory-add.controller.js | 0 .../inventories/smart-inventory/edit/main.js | 0 .../edit/smart-inventory-edit.controller.js | 0 .../inventories/smart-inventory/main.js | 0 .../host-filter-modal.block.less | 2 +- .../host-filter-modal.directive.js | 2 +- .../host-filter-modal.partial.html | 0 .../smart-inventory-host-filter.controller.js | 0 .../smart-inventory-host-filter.directive.js | 2 +- .../smart-inventory-host-filter.partial.html | 0 .../smart-inventory-hosts.route.js | 10 +- .../smart-inventory/smart-inventory.form.js | 0 .../add/inventory-add.controller.js | 0 .../standard-inventory}/add/main.js | 0 .../edit/inventory-edit.controller.js | 0 .../standard-inventory}/edit/main.js | 0 .../standard-inventory}/inventory.form.js | 0 .../inventories/standard-inventory}/main.js | 0 awx/ui/client/src/inventories-hosts/main.js | 16 ++ .../ansible-facts.controller.js} | 0 .../ansible-facts/ansible-facts.partial.html} | 0 .../ansible-facts/ansible-facts.route.js} | 6 +- .../shared/ansible-facts}/main.js | 2 +- .../associate-groups.block.less} | 4 +- .../associate-groups.controller.js} | 25 +-- .../associate-groups.directive.js | 60 ++++++ .../associate-groups.partial.html} | 8 +- .../associate-hosts.block.less | 14 ++ .../associate-hosts.controller.js | 106 +++++++++ .../associate-hosts.directive.js} | 18 +- .../associate-hosts.partial.html | 21 ++ .../factories}/set-enabled-msg.factory.js | 0 .../shared/factories}/set-status.factory.js | 0 .../shared}/groups.service.js | 18 ++ .../shared}/hosts.service.js | 31 +-- .../shared/inventories.service.js} | 0 .../src/inventories-hosts/shared/main.js | 26 +++ .../copy-move/copy-move-groups.controller.js | 78 ------- .../copy-move/copy-move-groups.list.js | 24 --- .../copy-move/copy-move-hosts.controller.js | 67 ------ .../copy-move/copy-move.block.less | 33 --- .../copy-move/copy-move.partial.html | 21 -- .../inventories/copy-move/copy-move.route.js | 98 --------- .../client/src/inventories/copy-move/main.js | 15 -- .../nested-hosts/nested-hosts-edit.route.js | 27 --- .../host-groups-associate.route.js | 46 ---- .../src/inventories/host-groups/main.js | 15 -- awx/ui/client/src/inventories/hosts/main.js | 25 --- awx/ui/client/src/shared/directives.js | 127 ----------- .../src/shared/stateDefinitions.factory.js | 6 +- .../manage/inventory-manage.service-test.js | 14 +- 179 files changed, 1393 insertions(+), 1154 deletions(-) rename awx/ui/client/src/{inventories => inventories-hosts}/hosts/edit/host-edit.controller.js (94%) rename awx/ui/client/src/{inventories => inventories-hosts}/hosts/edit/main.js (100%) rename awx/ui/client/src/{inventories => inventories-hosts}/hosts/host.form.js (100%) rename awx/ui/client/src/{inventories => inventories-hosts}/hosts/host.list.js (100%) rename awx/ui/client/src/{inventories => inventories-hosts}/hosts/hosts.partial.html (100%) rename awx/ui/client/src/{inventories => inventories-hosts}/hosts/list/host-list.controller.js (95%) rename awx/ui/client/src/{inventories => inventories-hosts}/hosts/list/main.js (100%) create mode 100644 awx/ui/client/src/inventories-hosts/hosts/main.js create mode 100644 awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups-associate.route.js rename awx/ui/client/src/{inventories/host-groups/host-groups.controller.js => inventories-hosts/hosts/related/groups/hosts-related-groups.controller.js} (83%) rename awx/ui/client/src/{inventories/host-groups/host-groups.list.js => inventories-hosts/hosts/related/groups/hosts-related-groups.list.js} (97%) rename awx/ui/client/src/{inventories/host-groups/host-groups.partial.html => inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html} (88%) rename awx/ui/client/src/{inventories/host-groups/host-groups.route.js => inventories-hosts/hosts/related/groups/hosts-related-groups.route.js} (64%) create mode 100644 awx/ui/client/src/inventories-hosts/hosts/related/groups/main.js rename awx/ui/client/src/{ => inventories-hosts}/inventories/adhoc/adhoc-credential.route.js (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/adhoc/adhoc.controller.js (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/adhoc/adhoc.form.js (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/adhoc/adhoc.partial.html (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/adhoc/adhoc.route.js (72%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/adhoc/main.js (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/insights/insights.block.less (97%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/insights/insights.controller.js (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/insights/insights.partial.html (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/insights/insights.route.js (91%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/insights/insights.service.js (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/insights/main.js (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/insights/plan-filter.js (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/inventories.block.less (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/inventories.partial.html (96%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/inventories.route.js (91%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/inventory.list.js (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/list/host-summary-popover/host-summary-popover.block.less (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/list/host-summary-popover/host-summary-popover.controller.js (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/list/host-summary-popover/host-summary-popover.directive.js (97%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/list/host-summary-popover/host-summary-popover.partial.html (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/list/host-summary-popover/main.js (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/list/inventory-list.controller.js (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/list/main.js (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/list/source-summary-popover/main.js (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/list/source-summary-popover/source-summary-popover.controller.js (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/list/source-summary-popover/source-summary-popover.directive.js (97%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/list/source-summary-popover/source-summary-popover.partial.html (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/main.js (59%) rename awx/ui/client/src/{inventories/completed_jobs/completed_jobs.list.js => inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js} (100%) rename awx/ui/client/src/{inventories/completed_jobs/completed_jobs.route.js => inventories-hosts/inventories/related/completed-jobs/completed-jobs.route.js} (98%) rename awx/ui/client/src/{inventories/completed_jobs => inventories-hosts/inventories/related/completed-jobs}/main.js (86%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/groups/add/groups-add.controller.js (86%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/groups/add/groups-add.route.js (92%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/groups/add/main.js (100%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/groups/edit/groups-edit.controller.js (86%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/groups/edit/groups-edit.route.js (74%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/groups/edit/main.js (100%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/groups/factories/get-hosts-status-msg.factory.js (100%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/groups/groups.form.js (100%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/groups/groups.list.js (67%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/groups/list/groups-list.controller.js (91%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/groups/list/groups-list.partial.html (100%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/groups/list/groups-list.route.js (86%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/groups/list/main.js (100%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/groups/main.js (75%) rename awx/ui/client/src/{inventories/groups/nested-groups/nested-groups-add.controller.js => inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-add.controller.js} (85%) rename awx/ui/client/src/{inventories/groups/nested-groups/nested-groups-add.route.js => inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-add.route.js} (96%) create mode 100644 awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-associate.route.js create mode 100644 awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html rename awx/ui/client/src/{inventories/groups/nested-groups/nested-groups-list.controller.js => inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-list.controller.js} (61%) rename awx/ui/client/src/{inventories/groups/nested-groups/nested-groups.form.js => inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.form.js} (100%) rename awx/ui/client/src/{inventories/groups/nested-groups/nested-groups.list.js => inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js} (63%) rename awx/ui/client/src/{inventories/groups/nested-groups/nested-groups.route.js => inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.route.js} (71%) rename awx/ui/client/src/{inventories/groups => inventories-hosts/inventories/related/groups/related}/nested-groups/main.js (64%) create mode 100644 awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-add.controller.js rename awx/ui/client/src/{inventories/groups/nested-hosts/nested-hosts-add.route.js => inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-add.route.js} (92%) create mode 100644 awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-associate.route.js create mode 100644 awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html rename awx/ui/client/src/{inventories/groups/nested-hosts/nested-hosts-list.controller.js => inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-list.controller.js} (64%) rename awx/ui/client/src/{inventories/groups/nested-hosts/nested-hosts.form.js => inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js} (94%) rename awx/ui/client/src/{inventories/groups/nested-hosts/nested-hosts.list.js => inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js} (76%) rename awx/ui/client/src/{inventories/groups/nested-hosts/nested-hosts.route.js => inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.route.js} (77%) rename awx/ui/client/src/{inventories/groups => inventories-hosts/inventories/related/groups/related}/nested-hosts/main.js (56%) rename awx/ui/client/src/{inventories/related-hosts => inventories-hosts/inventories/related/hosts}/add/host-add.controller.js (68%) rename awx/ui/client/src/{inventories/related-hosts => inventories-hosts/inventories/related/hosts}/add/host-add.route.js (93%) rename awx/ui/client/src/{inventories/related-hosts => inventories-hosts/inventories/related/hosts}/add/main.js (100%) rename awx/ui/client/src/{inventories/related-hosts => inventories-hosts/inventories/related/hosts}/edit/host-edit.controller.js (93%) rename awx/ui/client/src/{inventories/related-hosts => inventories-hosts/inventories/related/hosts}/edit/host-edit.route.js (65%) rename awx/ui/client/src/{inventories/related-hosts => inventories-hosts/inventories/related/hosts}/edit/main.js (100%) rename awx/ui/client/src/{inventories/related-hosts => inventories-hosts/inventories/related/hosts}/list/host-list.controller.js (93%) rename awx/ui/client/src/{inventories/related-hosts => inventories-hosts/inventories/related/hosts}/list/main.js (100%) rename awx/ui/client/src/{inventories/related-hosts => inventories-hosts/inventories/related/hosts}/main.js (86%) rename awx/ui/client/src/{inventories/related-hosts => inventories-hosts/inventories/related/hosts}/related-groups-labels/main.js (100%) rename awx/ui/client/src/{inventories/related-hosts => inventories-hosts/inventories/related/hosts}/related-groups-labels/relatedGroupsLabelsList.block.less (100%) rename awx/ui/client/src/{inventories/related-hosts => inventories-hosts/inventories/related/hosts}/related-groups-labels/relatedGroupsLabelsList.directive.js (97%) rename awx/ui/client/src/{inventories/related-hosts => inventories-hosts/inventories/related/hosts}/related-groups-labels/relatedGroupsLabelsList.partial.html (100%) rename awx/ui/client/src/{inventories/related-hosts => inventories-hosts/inventories/related/hosts}/related-host.form.js (100%) rename awx/ui/client/src/{inventories/related-hosts => inventories-hosts/inventories/related/hosts}/related-host.list.js (95%) rename awx/ui/client/src/{inventories/related-hosts => inventories-hosts/inventories/related/hosts}/related-host.route.js (85%) create mode 100644 awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-associate.route.js create mode 100644 awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html create mode 100644 awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-list.controller.js create mode 100644 awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js create mode 100644 awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.route.js create mode 100644 awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/main.js rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/sources/add/main.js (100%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/sources/add/sources-add.controller.js (98%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/sources/add/sources-add.route.js (74%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/sources/edit/main.js (100%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/sources/edit/sources-edit.controller.js (99%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/sources/edit/sources-edit.route.js (79%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/sources/edit/sources-notifications.route.js (98%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/sources/factories/cancel-source-update.factory.js (100%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/sources/factories/get-source-type-options.factory.js (100%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/sources/factories/get-sync-status-msg.factory.js (100%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/sources/factories/view-update-status.factory.js (100%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/sources/list/main.js (100%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/sources/list/schedule/sources-schedule-add.route.js (71%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/sources/list/schedule/sources-schedule-edit.route.js (79%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/sources/list/schedule/sources-schedule.route.js (98%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/sources/list/sources-list.controller.js (100%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/sources/list/sources-list.partial.html (100%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/sources/list/sources-list.route.js (80%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/sources/lookup/sources-lookup-credential.route.js (100%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/sources/lookup/sources-lookup-inventory-script.route.js (86%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/sources/lookup/sources-lookup-project.route.js (100%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/sources/main.js (100%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/sources/sources.form.js (100%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/sources/sources.list.js (94%) rename awx/ui/client/src/{inventories => inventories-hosts/inventories/related}/sources/sources.service.js (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/smart-inventory/add/main.js (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/smart-inventory/add/smart-inventory-add.controller.js (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/smart-inventory/edit/main.js (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/smart-inventory/edit/smart-inventory-edit.controller.js (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/smart-inventory/main.js (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.block.less (53%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.directive.js (95%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.partial.html (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/smart-inventory/smart-inventory-host-filter/smart-inventory-host-filter.controller.js (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/smart-inventory/smart-inventory-host-filter/smart-inventory-host-filter.directive.js (84%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/smart-inventory/smart-inventory-host-filter/smart-inventory-host-filter.partial.html (100%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/smart-inventory/smart-inventory-hosts.route.js (82%) rename awx/ui/client/src/{ => inventories-hosts}/inventories/smart-inventory/smart-inventory.form.js (100%) rename awx/ui/client/src/{inventories/standard => inventories-hosts/inventories/standard-inventory}/add/inventory-add.controller.js (100%) rename awx/ui/client/src/{inventories/standard => inventories-hosts/inventories/standard-inventory}/add/main.js (100%) rename awx/ui/client/src/{inventories/standard => inventories-hosts/inventories/standard-inventory}/edit/inventory-edit.controller.js (100%) rename awx/ui/client/src/{inventories/standard => inventories-hosts/inventories/standard-inventory}/edit/main.js (100%) rename awx/ui/client/src/{inventories/standard => inventories-hosts/inventories/standard-inventory}/inventory.form.js (100%) rename awx/ui/client/src/{inventories/standard => inventories-hosts/inventories/standard-inventory}/main.js (100%) create mode 100644 awx/ui/client/src/inventories-hosts/main.js rename awx/ui/client/src/{inventories/ansible_facts/ansible_facts.controller.js => inventories-hosts/shared/ansible-facts/ansible-facts.controller.js} (100%) rename awx/ui/client/src/{inventories/ansible_facts/ansible_facts.partial.html => inventories-hosts/shared/ansible-facts/ansible-facts.partial.html} (100%) rename awx/ui/client/src/{inventories/ansible_facts/ansible_facts.route.js => inventories-hosts/shared/ansible-facts/ansible-facts.route.js} (75%) rename awx/ui/client/src/{inventories/ansible_facts => inventories-hosts/shared/ansible-facts}/main.js (83%) rename awx/ui/client/src/{inventories/host-groups/host-groups-associate/host-groups-associate.block.less => inventories-hosts/shared/associate-groups/associate-groups.block.less} (76%) rename awx/ui/client/src/{inventories/host-groups/host-groups-associate/host-groups-associate.controller.js => inventories-hosts/shared/associate-groups/associate-groups.controller.js} (81%) create mode 100644 awx/ui/client/src/inventories-hosts/shared/associate-groups/associate-groups.directive.js rename awx/ui/client/src/{inventories/host-groups/host-groups-associate/host-groups-associate.partial.html => inventories-hosts/shared/associate-groups/associate-groups.partial.html} (64%) create mode 100644 awx/ui/client/src/inventories-hosts/shared/associate-hosts/associate-hosts.block.less create mode 100644 awx/ui/client/src/inventories-hosts/shared/associate-hosts/associate-hosts.controller.js rename awx/ui/client/src/{inventories/host-groups/host-groups-associate/host-groups-associate.directive.js => inventories-hosts/shared/associate-hosts/associate-hosts.directive.js} (70%) create mode 100644 awx/ui/client/src/inventories-hosts/shared/associate-hosts/associate-hosts.partial.html rename awx/ui/client/src/{inventories/hosts => inventories-hosts/shared/factories}/set-enabled-msg.factory.js (100%) rename awx/ui/client/src/{inventories/hosts => inventories-hosts/shared/factories}/set-status.factory.js (100%) rename awx/ui/client/src/{inventories/groups => inventories-hosts/shared}/groups.service.js (85%) rename awx/ui/client/src/{inventories/hosts => inventories-hosts/shared}/hosts.service.js (65%) rename awx/ui/client/src/{inventories/inventory-manage.service.js => inventories-hosts/shared/inventories.service.js} (100%) create mode 100644 awx/ui/client/src/inventories-hosts/shared/main.js delete mode 100644 awx/ui/client/src/inventories/copy-move/copy-move-groups.controller.js delete mode 100644 awx/ui/client/src/inventories/copy-move/copy-move-groups.list.js delete mode 100644 awx/ui/client/src/inventories/copy-move/copy-move-hosts.controller.js delete mode 100644 awx/ui/client/src/inventories/copy-move/copy-move.block.less delete mode 100644 awx/ui/client/src/inventories/copy-move/copy-move.partial.html delete mode 100644 awx/ui/client/src/inventories/copy-move/copy-move.route.js delete mode 100644 awx/ui/client/src/inventories/copy-move/main.js delete mode 100644 awx/ui/client/src/inventories/groups/nested-hosts/nested-hosts-edit.route.js delete mode 100644 awx/ui/client/src/inventories/host-groups/host-groups-associate/host-groups-associate.route.js delete mode 100644 awx/ui/client/src/inventories/host-groups/main.js delete mode 100644 awx/ui/client/src/inventories/hosts/main.js diff --git a/awx/ui/client/src/activity-stream/factories/build-anchor.factory.js b/awx/ui/client/src/activity-stream/factories/build-anchor.factory.js index f3ccd0b9b0..914b22c53a 100644 --- a/awx/ui/client/src/activity-stream/factories/build-anchor.factory.js +++ b/awx/ui/client/src/activity-stream/factories/build-anchor.factory.js @@ -20,14 +20,14 @@ export default function BuildAnchor($log, $filter) { if (activity.operation === 'create' || activity.operation === 'delete'){ // the API formats the changes.inventory field as str 'myInventoryName-PrimaryKey' var inventory_id = _.last(activity.changes.inventory.split('-')); - url += 'inventories/' + inventory_id + '/manage?group=' + activity.changes.id; + url += 'inventories/' + inventory_id + '/groups/edit/' + activity.changes.id; } else { - url += 'inventories/' + activity.summary_fields.inventory[0].id + '/manage?group=' + (activity.changes.id || activity.changes.object1_pk); + url += 'inventories/' + activity.summary_fields.inventory[0].id + '/groups/edit/' + (activity.changes.id || activity.changes.object1_pk); } break; case 'host': - url += 'home/hosts/' + obj.id; + url += 'hosts/' + obj.id; break; case 'job': url += 'jobs/' + obj.id; diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js index e367c4d935..ccbf9b04ef 100644 --- a/awx/ui/client/src/app.js +++ b/awx/ui/client/src/app.js @@ -39,7 +39,7 @@ if ($basePath) { // Modules import portalMode from './portal-mode/main'; import systemTracking from './system-tracking/main'; -import inventories from './inventories/main'; +import inventoriesHosts from './inventories-hosts/main'; import inventoryScripts from './inventory-scripts/main'; import credentials from './credentials/main'; import credentialTypes from './credential-types/main'; @@ -104,7 +104,7 @@ var tower = angular.module('Tower', [ browserData.name, configuration.name, systemTracking.name, - inventories.name, + inventoriesHosts.name, inventoryScripts.name, credentials.name, credentialTypes.name, diff --git a/awx/ui/client/src/inventories/hosts/edit/host-edit.controller.js b/awx/ui/client/src/inventories-hosts/hosts/edit/host-edit.controller.js similarity index 94% rename from awx/ui/client/src/inventories/hosts/edit/host-edit.controller.js rename to awx/ui/client/src/inventories-hosts/hosts/edit/host-edit.controller.js index f467e8c62f..3cd6a00c28 100644 --- a/awx/ui/client/src/inventories/hosts/edit/host-edit.controller.js +++ b/awx/ui/client/src/inventories-hosts/hosts/edit/host-edit.controller.js @@ -5,8 +5,8 @@ *************************************************/ export default - ['$scope', '$state', '$stateParams', 'GenerateForm', 'ParseTypeChange', 'HostManageService', 'host', '$rootScope', - function($scope, $state, $stateParams, GenerateForm, ParseTypeChange, HostManageService, host, $rootScope){ + ['$scope', '$state', '$stateParams', 'GenerateForm', 'ParseTypeChange', 'HostsService', 'host', '$rootScope', + function($scope, $state, $stateParams, GenerateForm, ParseTypeChange, HostsService, host, $rootScope){ $scope.parseType = 'yaml'; $scope.formCancel = function(){ $state.go('^', null, {reload: true}); @@ -32,7 +32,7 @@ description: $scope.description, enabled: $scope.host.enabled }; - HostManageService.put(host).then(function(){ + HostsService.put(host).then(function(){ $state.go('.', null, {reload: true}); }); diff --git a/awx/ui/client/src/inventories/hosts/edit/main.js b/awx/ui/client/src/inventories-hosts/hosts/edit/main.js similarity index 100% rename from awx/ui/client/src/inventories/hosts/edit/main.js rename to awx/ui/client/src/inventories-hosts/hosts/edit/main.js diff --git a/awx/ui/client/src/inventories/hosts/host.form.js b/awx/ui/client/src/inventories-hosts/hosts/host.form.js similarity index 100% rename from awx/ui/client/src/inventories/hosts/host.form.js rename to awx/ui/client/src/inventories-hosts/hosts/host.form.js diff --git a/awx/ui/client/src/inventories/hosts/host.list.js b/awx/ui/client/src/inventories-hosts/hosts/host.list.js similarity index 100% rename from awx/ui/client/src/inventories/hosts/host.list.js rename to awx/ui/client/src/inventories-hosts/hosts/host.list.js diff --git a/awx/ui/client/src/inventories/hosts/hosts.partial.html b/awx/ui/client/src/inventories-hosts/hosts/hosts.partial.html similarity index 100% rename from awx/ui/client/src/inventories/hosts/hosts.partial.html rename to awx/ui/client/src/inventories-hosts/hosts/hosts.partial.html diff --git a/awx/ui/client/src/inventories/hosts/list/host-list.controller.js b/awx/ui/client/src/inventories-hosts/hosts/list/host-list.controller.js similarity index 95% rename from awx/ui/client/src/inventories/hosts/list/host-list.controller.js rename to awx/ui/client/src/inventories-hosts/hosts/list/host-list.controller.js index d88bfadeb3..3853d80462 100644 --- a/awx/ui/client/src/inventories/hosts/list/host-list.controller.js +++ b/awx/ui/client/src/inventories-hosts/hosts/list/host-list.controller.js @@ -7,7 +7,7 @@ function HostsList($scope, HostsList, $rootScope, GetBasePath, rbacUiControlService, Dataset, $state, $filter, Prompt, Wait, - HostManageService, SetStatus, canAdd) { + HostsService, SetStatus, canAdd) { let list = HostsList; @@ -73,7 +73,7 @@ function HostsList($scope, HostsList, $rootScope, GetBasePath, var action = function(){ delete $rootScope.promptActionBtnClass; Wait('start'); - HostManageService.delete(id).then(() => { + HostsService.delete(id).then(() => { $('#prompt-modal').modal('hide'); if (parseInt($state.params.host_id) === id) { $state.go("hosts", null, {reload: true}); @@ -102,7 +102,7 @@ function HostsList($scope, HostsList, $rootScope, GetBasePath, host.enabled = !host.enabled; - HostManageService.put(host).then(function(){ + HostsService.put(host).then(function(){ $state.go($state.current, null, {reload: true}); }); }; @@ -139,5 +139,5 @@ function HostsList($scope, HostsList, $rootScope, GetBasePath, export default ['$scope', 'HostsList', '$rootScope', 'GetBasePath', 'rbacUiControlService', 'Dataset', '$state', '$filter', 'Prompt', 'Wait', - 'HostManageService', 'SetStatus', 'canAdd', HostsList + 'HostsService', 'SetStatus', 'canAdd', HostsList ]; diff --git a/awx/ui/client/src/inventories/hosts/list/main.js b/awx/ui/client/src/inventories-hosts/hosts/list/main.js similarity index 100% rename from awx/ui/client/src/inventories/hosts/list/main.js rename to awx/ui/client/src/inventories-hosts/hosts/list/main.js diff --git a/awx/ui/client/src/inventories-hosts/hosts/main.js b/awx/ui/client/src/inventories-hosts/hosts/main.js new file mode 100644 index 0000000000..09a368a825 --- /dev/null +++ b/awx/ui/client/src/inventories-hosts/hosts/main.js @@ -0,0 +1,112 @@ +/************************************************* + * Copyright (c) 2017 Ansible, Inc. + * + * All Rights Reserved + *************************************************/ + + import hostEdit from './edit/main'; + import hostList from './list/main'; + import HostsList from './host.list'; + import HostsForm from './host.form'; + import { templateUrl } from '../../shared/template-url/template-url.factory'; + import { N_ } from '../../i18n'; + import ansibleFactsRoute from '../shared/ansible-facts/ansible-facts.route'; + import insightsRoute from '../inventories/insights/insights.route'; + import hostGroupsRoute from './related/groups/hosts-related-groups.route'; + import hostGroupsAssociateRoute from './related/groups/hosts-related-groups-associate.route'; + import hostGroups from './related/groups/main'; + +export default +angular.module('host', [ + hostEdit.name, + hostList.name, + hostGroups.name + ]) + .factory('HostsForm', HostsForm) + .factory('HostsList', HostsList) + .config(['$stateProvider', 'stateDefinitionsProvider', '$stateExtenderProvider', + function($stateProvider, stateDefinitionsProvider, $stateExtenderProvider) { + let stateDefinitions = stateDefinitionsProvider.$get(), + stateExtender = $stateExtenderProvider.$get(); + + let generateHostStates = function(){ + let hostTree = stateDefinitions.generateTree({ + parent: 'hosts', // top-most node in the generated tree (will replace this state definition) + modes: ['edit'], + list: 'HostsList', + form: 'HostsForm', + controllers: { + edit: 'HostEditController' + }, + breadcrumbs: { + edit: '{{breadcrumb.host_name}}' + }, + urls: { + list: '/hosts' + }, + data: { + activityStream: true, + activityStreamTarget: 'host' + }, + resolve: { + edit: { + host: ['Rest', '$stateParams', 'GetBasePath', + function(Rest, $stateParams, GetBasePath) { + let path = GetBasePath('hosts') + $stateParams.host_id; + Rest.setUrl(path); + return Rest.get(); + } + ] + }, + list: { + canAdd: ['rbacUiControlService', function(rbacUiControlService) { + return rbacUiControlService.canAdd('hosts') + .then(function(res) { + return res.canAdd; + }) + .catch(function() { + return false; + }); + }] + } + }, + views: { + '@': { + templateUrl: templateUrl('inventories-hosts/hosts/hosts'), + controller: 'HostListController' + } + }, + ncyBreadcrumb: { + label: N_('HOSTS') + } + }); + + let hostAnsibleFacts = _.cloneDeep(ansibleFactsRoute); + hostAnsibleFacts.name = 'hosts.edit.ansible_facts'; + + let hostInsights = _.cloneDeep(insightsRoute); + hostInsights.name = 'hosts.edit.insights'; + + return Promise.all([ + hostTree + ]).then((generated) => { + return { + states: _.reduce(generated, (result, definition) => { + return result.concat(definition.states); + }, [ + stateExtender.buildDefinition(hostAnsibleFacts), + stateExtender.buildDefinition(hostInsights), + stateExtender.buildDefinition(hostGroupsRoute), + stateExtender.buildDefinition(hostGroupsAssociateRoute) + ]) + }; + }); + }; + + $stateProvider.state({ + name: 'hosts', + url: '/hosts', + lazyLoad: () => generateHostStates() + }); + } + ]); diff --git a/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups-associate.route.js b/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups-associate.route.js new file mode 100644 index 0000000000..169a9d6b7a --- /dev/null +++ b/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups-associate.route.js @@ -0,0 +1,33 @@ +export default { + name: 'hosts.edit.groups.associate', + squashSearchUrl: true, + url: '/associate?inventory_id', + ncyBreadcrumb:{ + skip:true + }, + views: { + 'modal@hosts.edit': { + templateProvider: function() { + return ``; + }, + controller: function($scope, $q, GroupsService, $state){ + $scope.associateGroups = function(selectedItems){ + var deferred = $q.defer(); + return $q.all( _.map(selectedItems, (id) => GroupsService.associateHost({id: parseInt($state.params.host_id)}, id)) ) + .then( () =>{ + deferred.resolve(); + }, (error) => { + deferred.reject(error); + }); + }; + } + } + }, + onExit: function($state) { + if ($state.transition) { + $('#associate-groups-modal').modal('hide'); + $('.modal-backdrop').remove(); + $('body').removeClass('modal-open'); + } + }, +}; diff --git a/awx/ui/client/src/inventories/host-groups/host-groups.controller.js b/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.controller.js similarity index 83% rename from awx/ui/client/src/inventories/host-groups/host-groups.controller.js rename to awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.controller.js index 31fe1d236d..bd32646dcc 100644 --- a/awx/ui/client/src/inventories/host-groups/host-groups.controller.js +++ b/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.controller.js @@ -4,14 +4,14 @@ * All Rights Reserved *************************************************/ export default - ['$scope', '$rootScope', '$state', '$stateParams', 'HostGroupsList', 'InventoryUpdate', - 'HostManageService', 'CancelSourceUpdate', 'rbacUiControlService', 'GetBasePath', - 'GetHostsStatusMsg', 'Dataset', 'Find', 'QuerySet', 'inventoryData', 'host', - function($scope, $rootScope, $state, $stateParams, HostGroupsList, InventoryUpdate, - HostManageService, CancelSourceUpdate, rbacUiControlService, GetBasePath, - GetHostsStatusMsg, Dataset, Find, qs, inventoryData, host){ + ['$scope', '$rootScope', '$state', '$stateParams', 'HostsRelatedGroupsList', 'InventoryUpdate', + 'CancelSourceUpdate', 'rbacUiControlService', 'GetBasePath', + 'GetHostsStatusMsg', 'Dataset', 'Find', 'QuerySet', 'inventoryData', 'host', 'GroupsService', + function($scope, $rootScope, $state, $stateParams, HostsRelatedGroupsList, InventoryUpdate, + CancelSourceUpdate, rbacUiControlService, GetBasePath, + GetHostsStatusMsg, Dataset, Find, qs, inventoryData, host, GroupsService){ - let list = HostGroupsList; + let list = HostsRelatedGroupsList; init(); @@ -73,7 +73,7 @@ $state.go('.', null, {reload: true}); }); - HostManageService.disassociateGroup(host, $scope.disassociateGroup.id).then(() => { + GroupsService.disassociateHost(host.id, $scope.disassociateGroup.id).then(() => { $state.go($state.current, null, {reload: true}); $('#host-disassociate-modal').modal('hide'); $('body').removeClass('modal-open'); diff --git a/awx/ui/client/src/inventories/host-groups/host-groups.list.js b/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.list.js similarity index 97% rename from awx/ui/client/src/inventories/host-groups/host-groups.list.js rename to awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.list.js index 5bb9c85ee3..103eeca93f 100644 --- a/awx/ui/client/src/inventories/host-groups/host-groups.list.js +++ b/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.list.js @@ -49,7 +49,7 @@ export default { ngClick: "associateGroup()", awToolTip: "Associate this host with a new group", actionClass: 'btn List-buttonSubmit', - buttonContent: '+ ADD GROUP', + buttonContent: '+ ASSOCIATE GROUP', ngShow: 'canAdd', dataPlacement: "top", } diff --git a/awx/ui/client/src/inventories/host-groups/host-groups.partial.html b/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html similarity index 88% rename from awx/ui/client/src/inventories/host-groups/host-groups.partial.html rename to awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html index 81d3a90e85..35d250f4c2 100644 --- a/awx/ui/client/src/inventories/host-groups/host-groups.partial.html +++ b/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html @@ -5,7 +5,7 @@
Disassociate Host
-
Are you sure you want to disassociate this host: {{host.name}} from this group: {{disassociateGroup.name}}?
+
Are you sure you want to disassociate the host below from {{disassociateGroup.name}}?
+
{{ host.name }}
CANCEL diff --git a/awx/ui/client/src/inventories/host-groups/host-groups.route.js b/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.route.js similarity index 64% rename from awx/ui/client/src/inventories/host-groups/host-groups.route.js rename to awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.route.js index b367ee7d37..fd21ff7b1d 100644 --- a/awx/ui/client/src/inventories/host-groups/host-groups.route.js +++ b/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.route.js @@ -1,11 +1,11 @@ -import { N_ } from '../../i18n'; -import {templateUrl} from '../../shared/template-url/template-url.factory'; +import { N_ } from '../../../../i18n'; +import {templateUrl} from '../../../../shared/template-url/template-url.factory'; export default { name: "hosts.edit.groups", url: "/groups?{group_search:queryset}", resolve: { - Dataset: ['HostGroupsList', 'QuerySet', '$stateParams', 'GetBasePath', '$interpolate', '$rootScope', + Dataset: ['HostsRelatedGroupsList', 'QuerySet', '$stateParams', 'GetBasePath', '$interpolate', '$rootScope', (list, qs, $stateParams, GetBasePath, $interpolate, $rootScope) => { // allow related list definitions to use interpolated $rootScope / $stateParams in basePath field let path, interpolator; @@ -18,16 +18,16 @@ export default { return qs.search(path, $stateParams[`${list.iterator}_search`]); } ], - host: ['$stateParams', 'HostManageService', function($stateParams, HostManageService) { + host: ['$stateParams', 'HostsService', function($stateParams, HostsService) { if($stateParams.host_id){ - return HostManageService.get({ id: $stateParams.host_id }).then(function(res) { + return HostsService.get({ id: $stateParams.host_id }).then(function(res) { return res.data.results[0]; }); } }], - inventoryData: ['InventoryManageService', '$stateParams', 'host', function(InventoryManageService, $stateParams, host) { + inventoryData: ['InventoriesService', '$stateParams', 'host', function(InventoriesService, $stateParams, host) { var id = ($stateParams.inventory_id) ? $stateParams.inventory_id : host.summary_fields.inventory.id; - return InventoryManageService.getInventory(id).then(res => res.data); + return InventoriesService.getInventory(id).then(res => res.data); }] }, params: { @@ -46,17 +46,17 @@ export default { }, views: { 'related': { - templateProvider: function(HostGroupsList, generateList, $templateRequest) { + templateProvider: function(HostsRelatedGroupsList, generateList, $templateRequest) { let html = generateList.build({ - list: HostGroupsList, + list: HostsRelatedGroupsList, mode: 'edit' }); - return $templateRequest(templateUrl('inventories/host-groups/host-groups')).then((template) => { + return $templateRequest(templateUrl('inventories-hosts/hosts/related/groups/hosts-related-groups')).then((template) => { return html.concat(template); }); }, - controller: 'HostGroupsController' + controller: 'HostsRelatedGroupsController' } } }; diff --git a/awx/ui/client/src/inventories-hosts/hosts/related/groups/main.js b/awx/ui/client/src/inventories-hosts/hosts/related/groups/main.js new file mode 100644 index 0000000000..6fd81ad00c --- /dev/null +++ b/awx/ui/client/src/inventories-hosts/hosts/related/groups/main.js @@ -0,0 +1,14 @@ +/************************************************* + * Copyright (c) 2017 Ansible, Inc. + * + * All Rights Reserved + *************************************************/ + +import controller from './hosts-related-groups.controller'; +import hostGroupsDefinition from './hosts-related-groups.list'; + + +export default + angular.module('hostGroups', []) + .value('HostsRelatedGroupsList', hostGroupsDefinition) + .controller('HostsRelatedGroupsController', controller); diff --git a/awx/ui/client/src/inventories/adhoc/adhoc-credential.route.js b/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc-credential.route.js similarity index 100% rename from awx/ui/client/src/inventories/adhoc/adhoc-credential.route.js rename to awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc-credential.route.js diff --git a/awx/ui/client/src/inventories/adhoc/adhoc.controller.js b/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.controller.js similarity index 100% rename from awx/ui/client/src/inventories/adhoc/adhoc.controller.js rename to awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.controller.js diff --git a/awx/ui/client/src/inventories/adhoc/adhoc.form.js b/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.form.js similarity index 100% rename from awx/ui/client/src/inventories/adhoc/adhoc.form.js rename to awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.form.js diff --git a/awx/ui/client/src/inventories/adhoc/adhoc.partial.html b/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.partial.html similarity index 100% rename from awx/ui/client/src/inventories/adhoc/adhoc.partial.html rename to awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.partial.html diff --git a/awx/ui/client/src/inventories/adhoc/adhoc.route.js b/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.route.js similarity index 72% rename from awx/ui/client/src/inventories/adhoc/adhoc.route.js rename to awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.route.js index a64d5b87dd..3b96425d93 100644 --- a/awx/ui/client/src/inventories/adhoc/adhoc.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.route.js @@ -4,8 +4,8 @@ * All Rights Reserved *************************************************/ - import {templateUrl} from '../../shared/template-url/template-url.factory'; - import { N_ } from '../../i18n'; + import {templateUrl} from '../../../shared/template-url/template-url.factory'; + import { N_ } from '../../../i18n'; export default { url: '/adhoc', @@ -20,7 +20,7 @@ export default { }, views: { 'adhocForm@inventories': { - templateUrl: templateUrl('inventories/adhoc/adhoc'), + templateUrl: templateUrl('inventories-hosts/inventories/adhoc/adhoc'), controller: 'adhocController' } }, diff --git a/awx/ui/client/src/inventories/adhoc/main.js b/awx/ui/client/src/inventories-hosts/inventories/adhoc/main.js similarity index 100% rename from awx/ui/client/src/inventories/adhoc/main.js rename to awx/ui/client/src/inventories-hosts/inventories/adhoc/main.js diff --git a/awx/ui/client/src/inventories/insights/insights.block.less b/awx/ui/client/src/inventories-hosts/inventories/insights/insights.block.less similarity index 97% rename from awx/ui/client/src/inventories/insights/insights.block.less rename to awx/ui/client/src/inventories-hosts/inventories/insights/insights.block.less index a353bd76f4..f651c30cf3 100644 --- a/awx/ui/client/src/inventories/insights/insights.block.less +++ b/awx/ui/client/src/inventories-hosts/inventories/insights/insights.block.less @@ -1,4 +1,4 @@ -@import "../../shared/branding/colors.default.less"; +@import "../../../shared/branding/colors.default.less"; .InsightsLastCheck{ display: flex; diff --git a/awx/ui/client/src/inventories/insights/insights.controller.js b/awx/ui/client/src/inventories-hosts/inventories/insights/insights.controller.js similarity index 100% rename from awx/ui/client/src/inventories/insights/insights.controller.js rename to awx/ui/client/src/inventories-hosts/inventories/insights/insights.controller.js diff --git a/awx/ui/client/src/inventories/insights/insights.partial.html b/awx/ui/client/src/inventories-hosts/inventories/insights/insights.partial.html similarity index 100% rename from awx/ui/client/src/inventories/insights/insights.partial.html rename to awx/ui/client/src/inventories-hosts/inventories/insights/insights.partial.html diff --git a/awx/ui/client/src/inventories/insights/insights.route.js b/awx/ui/client/src/inventories-hosts/inventories/insights/insights.route.js similarity index 91% rename from awx/ui/client/src/inventories/insights/insights.route.js rename to awx/ui/client/src/inventories-hosts/inventories/insights/insights.route.js index 2fdb93c2e7..179af657af 100644 --- a/awx/ui/client/src/inventories/insights/insights.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/insights/insights.route.js @@ -1,5 +1,5 @@ -import {templateUrl} from '../../shared/template-url/template-url.factory'; -import { N_ } from '../../i18n'; +import {templateUrl} from '../../../shared/template-url/template-url.factory'; +import { N_ } from '../../../i18n'; export default { url: '/insights', @@ -9,7 +9,7 @@ export default { views: { 'related': { controller: 'InsightsController', - templateUrl: templateUrl('inventories/insights/insights') + templateUrl: templateUrl('inventories-hosts/inventories/insights/insights') } }, resolve: { diff --git a/awx/ui/client/src/inventories/insights/insights.service.js b/awx/ui/client/src/inventories-hosts/inventories/insights/insights.service.js similarity index 100% rename from awx/ui/client/src/inventories/insights/insights.service.js rename to awx/ui/client/src/inventories-hosts/inventories/insights/insights.service.js diff --git a/awx/ui/client/src/inventories/insights/main.js b/awx/ui/client/src/inventories-hosts/inventories/insights/main.js similarity index 100% rename from awx/ui/client/src/inventories/insights/main.js rename to awx/ui/client/src/inventories-hosts/inventories/insights/main.js diff --git a/awx/ui/client/src/inventories/insights/plan-filter.js b/awx/ui/client/src/inventories-hosts/inventories/insights/plan-filter.js similarity index 100% rename from awx/ui/client/src/inventories/insights/plan-filter.js rename to awx/ui/client/src/inventories-hosts/inventories/insights/plan-filter.js diff --git a/awx/ui/client/src/inventories/inventories.block.less b/awx/ui/client/src/inventories-hosts/inventories/inventories.block.less similarity index 100% rename from awx/ui/client/src/inventories/inventories.block.less rename to awx/ui/client/src/inventories-hosts/inventories/inventories.block.less diff --git a/awx/ui/client/src/inventories/inventories.partial.html b/awx/ui/client/src/inventories-hosts/inventories/inventories.partial.html similarity index 96% rename from awx/ui/client/src/inventories/inventories.partial.html rename to awx/ui/client/src/inventories-hosts/inventories/inventories.partial.html index 3cfe4b2711..73bb0becd1 100644 --- a/awx/ui/client/src/inventories/inventories.partial.html +++ b/awx/ui/client/src/inventories-hosts/inventories/inventories.partial.html @@ -1,6 +1,5 @@
-
diff --git a/awx/ui/client/src/inventories/inventories.route.js b/awx/ui/client/src/inventories-hosts/inventories/inventories.route.js similarity index 91% rename from awx/ui/client/src/inventories/inventories.route.js rename to awx/ui/client/src/inventories-hosts/inventories/inventories.route.js index 6d0efc8431..3d78c78323 100644 --- a/awx/ui/client/src/inventories/inventories.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/inventories.route.js @@ -1,5 +1,5 @@ -import {templateUrl} from '../shared/template-url/template-url.factory'; -import { N_ } from '../i18n'; +import {templateUrl} from '../../shared/template-url/template-url.factory'; +import { N_ } from '../../i18n'; export default { name: 'inventories', // top-most node in the generated tree (will replace this state definition) @@ -13,7 +13,7 @@ export default { }, views: { '@': { - templateUrl: templateUrl('inventories/inventories') + templateUrl: templateUrl('inventories-hosts/inventories/inventories') }, 'list@inventories': { templateProvider: function(InventoryList, generateList) { diff --git a/awx/ui/client/src/inventories/inventory.list.js b/awx/ui/client/src/inventories-hosts/inventories/inventory.list.js similarity index 100% rename from awx/ui/client/src/inventories/inventory.list.js rename to awx/ui/client/src/inventories-hosts/inventories/inventory.list.js diff --git a/awx/ui/client/src/inventories/list/host-summary-popover/host-summary-popover.block.less b/awx/ui/client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.block.less similarity index 100% rename from awx/ui/client/src/inventories/list/host-summary-popover/host-summary-popover.block.less rename to awx/ui/client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.block.less diff --git a/awx/ui/client/src/inventories/list/host-summary-popover/host-summary-popover.controller.js b/awx/ui/client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.controller.js similarity index 100% rename from awx/ui/client/src/inventories/list/host-summary-popover/host-summary-popover.controller.js rename to awx/ui/client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.controller.js diff --git a/awx/ui/client/src/inventories/list/host-summary-popover/host-summary-popover.directive.js b/awx/ui/client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.directive.js similarity index 97% rename from awx/ui/client/src/inventories/list/host-summary-popover/host-summary-popover.directive.js rename to awx/ui/client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.directive.js index 713d5041f2..cc732bedbe 100644 --- a/awx/ui/client/src/inventories/list/host-summary-popover/host-summary-popover.directive.js +++ b/awx/ui/client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.directive.js @@ -7,7 +7,7 @@ export default ['templateUrl', 'Wait', '$filter', '$compile', inventory: '=' }, controller: 'HostSummaryPopoverController', - templateUrl: templateUrl('inventories/list/host-summary-popover/host-summary-popover'), + templateUrl: templateUrl('inventories-hosts/inventories/list/host-summary-popover/host-summary-popover'), link: function(scope) { function ellipsis(a) { diff --git a/awx/ui/client/src/inventories/list/host-summary-popover/host-summary-popover.partial.html b/awx/ui/client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.partial.html similarity index 100% rename from awx/ui/client/src/inventories/list/host-summary-popover/host-summary-popover.partial.html rename to awx/ui/client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.partial.html diff --git a/awx/ui/client/src/inventories/list/host-summary-popover/main.js b/awx/ui/client/src/inventories-hosts/inventories/list/host-summary-popover/main.js similarity index 100% rename from awx/ui/client/src/inventories/list/host-summary-popover/main.js rename to awx/ui/client/src/inventories-hosts/inventories/list/host-summary-popover/main.js diff --git a/awx/ui/client/src/inventories/list/inventory-list.controller.js b/awx/ui/client/src/inventories-hosts/inventories/list/inventory-list.controller.js similarity index 100% rename from awx/ui/client/src/inventories/list/inventory-list.controller.js rename to awx/ui/client/src/inventories-hosts/inventories/list/inventory-list.controller.js diff --git a/awx/ui/client/src/inventories/list/main.js b/awx/ui/client/src/inventories-hosts/inventories/list/main.js similarity index 100% rename from awx/ui/client/src/inventories/list/main.js rename to awx/ui/client/src/inventories-hosts/inventories/list/main.js diff --git a/awx/ui/client/src/inventories/list/source-summary-popover/main.js b/awx/ui/client/src/inventories-hosts/inventories/list/source-summary-popover/main.js similarity index 100% rename from awx/ui/client/src/inventories/list/source-summary-popover/main.js rename to awx/ui/client/src/inventories-hosts/inventories/list/source-summary-popover/main.js diff --git a/awx/ui/client/src/inventories/list/source-summary-popover/source-summary-popover.controller.js b/awx/ui/client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.controller.js similarity index 100% rename from awx/ui/client/src/inventories/list/source-summary-popover/source-summary-popover.controller.js rename to awx/ui/client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.controller.js diff --git a/awx/ui/client/src/inventories/list/source-summary-popover/source-summary-popover.directive.js b/awx/ui/client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.directive.js similarity index 97% rename from awx/ui/client/src/inventories/list/source-summary-popover/source-summary-popover.directive.js rename to awx/ui/client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.directive.js index 1d40d15593..dcc9cad354 100644 --- a/awx/ui/client/src/inventories/list/source-summary-popover/source-summary-popover.directive.js +++ b/awx/ui/client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.directive.js @@ -7,7 +7,7 @@ export default ['templateUrl', '$compile', 'Wait', '$filter', inventory: '=' }, controller: 'SourceSummaryPopoverController', - templateUrl: templateUrl('inventories/list/source-summary-popover/source-summary-popover'), + templateUrl: templateUrl('inventories-hosts/inventories/list/source-summary-popover/source-summary-popover'), link: function(scope) { function ellipsis(a) { diff --git a/awx/ui/client/src/inventories/list/source-summary-popover/source-summary-popover.partial.html b/awx/ui/client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.partial.html similarity index 100% rename from awx/ui/client/src/inventories/list/source-summary-popover/source-summary-popover.partial.html rename to awx/ui/client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.partial.html diff --git a/awx/ui/client/src/inventories/main.js b/awx/ui/client/src/inventories-hosts/inventories/main.js similarity index 59% rename from awx/ui/client/src/inventories/main.js rename to awx/ui/client/src/inventories-hosts/inventories/main.js index 361d7620c8..0a11f575b1 100644 --- a/awx/ui/client/src/inventories/main.js +++ b/awx/ui/client/src/inventories-hosts/inventories/main.js @@ -5,72 +5,60 @@ *************************************************/ import adhoc from './adhoc/main'; -import host from './hosts/main'; -import group from './groups/main'; -import sources from './sources/main'; -import relatedHost from './related-hosts/main'; -import inventoryCompletedJobs from './completed_jobs/main'; +import group from './related/groups/main'; +import sources from './related/sources/main'; +import relatedHost from './related/hosts/main'; +import inventoryCompletedJobs from './related/completed-jobs/main'; import inventoryList from './list/main'; -import hostGroups from './host-groups/main'; -import { templateUrl } from '../shared/template-url/template-url.factory'; -import { N_ } from '../i18n'; import InventoryList from './inventory.list'; -import InventoryManageService from './inventory-manage.service'; import adHocRoute from './adhoc/adhoc.route'; -import ansibleFacts from './ansible_facts/main'; import insights from './insights/main'; -import { copyMoveGroupRoute, copyMoveHostRoute } from './copy-move/copy-move.route'; -import copyMove from './copy-move/main'; -import completedJobsRoute from './completed_jobs/completed_jobs.route'; -import inventorySourceEditRoute from './sources/edit/sources-edit.route'; -import inventorySourceEditNotificationsRoute from './sources/edit/sources-notifications.route'; -import inventorySourceAddRoute from './sources/add/sources-add.route'; -import inventorySourceListRoute from './sources/list/sources-list.route'; -import inventorySourceListScheduleRoute from './sources/list/schedule/sources-schedule.route'; -import inventorySourceListScheduleAddRoute from './sources/list/schedule/sources-schedule-add.route'; -import inventorySourceListScheduleEditRoute from './sources/list/schedule/sources-schedule-edit.route'; +import completedJobsRoute from './related/completed-jobs/completed-jobs.route'; +import inventorySourceEditRoute from './related/sources/edit/sources-edit.route'; +import inventorySourceEditNotificationsRoute from './related/sources/edit/sources-notifications.route'; +import inventorySourceAddRoute from './related/sources/add/sources-add.route'; +import inventorySourceListRoute from './related/sources/list/sources-list.route'; +import inventorySourceListScheduleRoute from './related/sources/list/schedule/sources-schedule.route'; +import inventorySourceListScheduleAddRoute from './related/sources/list/schedule/sources-schedule-add.route'; +import inventorySourceListScheduleEditRoute from './related/sources/list/schedule/sources-schedule-edit.route'; import adhocCredentialRoute from './adhoc/adhoc-credential.route'; -import inventoryGroupsList from './groups/list/groups-list.route'; -import inventoryGroupsAdd from './groups/add/groups-add.route'; -import inventoryGroupsEdit from './groups/edit/groups-edit.route'; -import nestedGroups from './groups/nested-groups/nested-groups.route'; -import nestedGroupsAdd from './groups/nested-groups/nested-groups-add.route'; -import nestedHosts from './groups/nested-hosts/nested-hosts.route'; -import inventoryHosts from './related-hosts/related-host.route'; +import inventoryGroupsList from './related/groups/list/groups-list.route'; +import inventoryGroupsAdd from './related/groups/add/groups-add.route'; +import inventoryGroupsEdit from './related/groups/edit/groups-edit.route'; +import groupNestedGroupsRoute from './related/groups/related/nested-groups/group-nested-groups.route'; +import hostNestedGroupsRoute from './related/hosts/related/nested-groups/host-nested-groups.route'; +import nestedGroupsAdd from './related/groups/related/nested-groups/group-nested-groups-add.route'; +import nestedHostsRoute from './related/groups/related/nested-hosts/group-nested-hosts.route'; +import inventoryHosts from './related/hosts/related-host.route'; import smartInventoryHosts from './smart-inventory/smart-inventory-hosts.route'; import inventoriesList from './inventories.route'; -import inventoryHostsAdd from './related-hosts/add/host-add.route'; -import inventoryHostsEdit from './related-hosts/edit/host-edit.route'; -import nestedHostsAdd from './groups/nested-hosts/nested-hosts-add.route'; -import nestedHostsEdit from './groups/nested-hosts/nested-hosts-edit.route'; -import ansibleFactsRoute from './ansible_facts/ansible_facts.route'; +import inventoryHostsAdd from './related/hosts/add/host-add.route'; +import inventoryHostsEdit from './related/hosts/edit/host-edit.route'; +import ansibleFactsRoute from '../shared/ansible-facts/ansible-facts.route'; import insightsRoute from './insights/insights.route'; -import hostGroupsRoute from './host-groups/host-groups.route'; -import hostGroupsAssociateRoute from './host-groups/host-groups-associate/host-groups-associate.route'; -import inventorySourcesCredentialRoute from './sources/lookup/sources-lookup-credential.route'; -import inventorySourcesInventoryScriptRoute from './sources/lookup/sources-lookup-inventory-script.route'; -import inventorySourcesProjectRoute from './sources/lookup/sources-lookup-project.route'; +import inventorySourcesCredentialRoute from './related/sources/lookup/sources-lookup-credential.route'; +import inventorySourcesInventoryScriptRoute from './related/sources/lookup/sources-lookup-inventory-script.route'; +import inventorySourcesProjectRoute from './related/sources/lookup/sources-lookup-project.route'; import SmartInventory from './smart-inventory/main'; -import StandardInventory from './standard/main'; +import StandardInventory from './standard-inventory/main'; +import hostNestedGroupsAssociateRoute from './related/hosts/related/nested-groups/host-nested-groups-associate.route'; +import groupNestedGroupsAssociateRoute from './related/groups/related/nested-groups/group-nested-groups-associate.route'; +import nestedHostsAssociateRoute from './related/groups/related/nested-hosts/group-nested-hosts-associate.route'; +import nestedHostsAddRoute from './related/groups/related/nested-hosts/group-nested-hosts-add.route'; export default angular.module('inventory', [ adhoc.name, - host.name, group.name, sources.name, relatedHost.name, inventoryCompletedJobs.name, inventoryList.name, - ansibleFacts.name, insights.name, - copyMove.name, - hostGroups.name, SmartInventory.name, - StandardInventory.name + StandardInventory.name, ]) .factory('InventoryList', InventoryList) - .service('InventoryManageService', InventoryManageService) .config(['$stateProvider', 'stateDefinitionsProvider', '$stateExtenderProvider', function($stateProvider, stateDefinitionsProvider, $stateExtenderProvider) { let stateDefinitions = stateDefinitionsProvider.$get(), @@ -180,39 +168,12 @@ angular.module('inventory', [ } }); - let inventoryGroupsEditNestedGroups = _.cloneDeep(nestedGroups); - inventoryGroupsEditNestedGroups.name = "inventories.edit.groups.edit.nested_groups"; - inventoryGroupsEditNestedGroups.ncyBreadcrumb = { - parent: "inventories.edit.groups.edit", - label: "ASSOCIATED GROUPS" - }; - - let inventoryGroupsEditNestedHostsEditGroups = _.cloneDeep(nestedGroups); - inventoryGroupsEditNestedHostsEditGroups.name = "inventories.edit.groups.edit.nested_hosts.edit.nested_groups"; - inventoryGroupsEditNestedHostsEditGroups.ncyBreadcrumb = { - parent: "inventories.edit.groups.edit.nested_hosts.edit", - label: "ASSOCIATED GROUPS" - }; - - let inventoryHostsEditGroups = _.cloneDeep(nestedGroups); - inventoryHostsEditGroups.name = "inventories.edit.hosts.edit.nested_groups"; - inventoryHostsEditGroups.ncyBreadcrumb = { - parent: "inventories.edit.hosts.edit", - label: "ASSOCIATED GROUPS" - }; - let relatedHostsAnsibleFacts = _.cloneDeep(ansibleFactsRoute); relatedHostsAnsibleFacts.name = 'inventories.edit.hosts.edit.ansible_facts'; - let nestedHostsAnsibleFacts = _.cloneDeep(ansibleFactsRoute); - nestedHostsAnsibleFacts.name = 'inventories.edit.groups.edit.nested_hosts.edit.ansible_facts'; - let relatedHostsInsights = _.cloneDeep(insightsRoute); relatedHostsInsights.name = 'inventories.edit.hosts.edit.insights'; - let nestedHostsInsights = _.cloneDeep(insightsRoute); - nestedHostsInsights.name = 'inventories.edit.groups.edit.nested_hosts.edit.insights'; - let addSourceCredential = _.cloneDeep(inventorySourcesCredentialRoute); addSourceCredential.name = 'inventories.edit.inventory_sources.add.credential'; addSourceCredential.url = '/credential'; @@ -274,25 +235,17 @@ angular.module('inventory', [ stateExtender.buildDefinition(inventorySourceListScheduleAddRoute), stateExtender.buildDefinition(inventorySourceListScheduleEditRoute), stateExtender.buildDefinition(relatedHostsAnsibleFacts), - stateExtender.buildDefinition(nestedHostsAnsibleFacts), stateExtender.buildDefinition(relatedHostsInsights), - stateExtender.buildDefinition(nestedHostsInsights), - stateExtender.buildDefinition(copyMoveGroupRoute), - stateExtender.buildDefinition(copyMoveHostRoute), stateExtender.buildDefinition(inventoryGroupsList), stateExtender.buildDefinition(inventoryGroupsAdd), stateExtender.buildDefinition(inventoryGroupsEdit), - stateExtender.buildDefinition(inventoryGroupsEditNestedGroups), - stateExtender.buildDefinition(nestedGroupsAdd), - stateExtender.buildDefinition(nestedHosts), - stateExtender.buildDefinition(nestedHostsAdd), - stateExtender.buildDefinition(nestedHostsEdit), - stateExtender.buildDefinition(inventoryGroupsEditNestedHostsEditGroups), + stateExtender.buildDefinition(groupNestedGroupsRoute), + stateExtender.buildDefinition(nestedHostsRoute), stateExtender.buildDefinition(inventoryHosts), stateExtender.buildDefinition(smartInventoryHosts), stateExtender.buildDefinition(inventoryHostsAdd), stateExtender.buildDefinition(inventoryHostsEdit), - stateExtender.buildDefinition(inventoryHostsEditGroups), + stateExtender.buildDefinition(hostNestedGroupsRoute), stateExtender.buildDefinition(inventorySourceListRoute), stateExtender.buildDefinition(inventorySourceAddRoute), stateExtender.buildDefinition(inventorySourceEditRoute), @@ -304,93 +257,18 @@ angular.module('inventory', [ stateExtender.buildDefinition(editSourceCredential), stateExtender.buildDefinition(editSourceInventoryScript), stateExtender.buildDefinition(addSourceProject), - stateExtender.buildDefinition(editSourceProject) + stateExtender.buildDefinition(editSourceProject), + stateExtender.buildDefinition(groupNestedGroupsAssociateRoute), + stateExtender.buildDefinition(hostNestedGroupsAssociateRoute), + stateExtender.buildDefinition(nestedHostsAssociateRoute), + stateExtender.buildDefinition(nestedGroupsAdd), + stateExtender.buildDefinition(nestedHostsAddRoute) ]) }; }); } - let generateHostStates = function(){ - let hostTree = stateDefinitions.generateTree({ - parent: 'hosts', // top-most node in the generated tree (will replace this state definition) - modes: ['edit'], - list: 'HostsList', - form: 'HostsForm', - controllers: { - edit: 'HostEditController' - }, - breadcrumbs: { - edit: '{{breadcrumb.host_name}}' - }, - urls: { - list: '/hosts' - }, - data: { - activityStream: true, - activityStreamTarget: 'host' - }, - resolve: { - edit: { - host: ['Rest', '$stateParams', 'GetBasePath', - function(Rest, $stateParams, GetBasePath) { - let path = GetBasePath('hosts') + $stateParams.host_id; - Rest.setUrl(path); - return Rest.get(); - } - ] - }, - list: { - canAdd: ['rbacUiControlService', function(rbacUiControlService) { - return rbacUiControlService.canAdd('hosts') - .then(function(res) { - return res.canAdd; - }) - .catch(function() { - return false; - }); - }] - } - }, - views: { - '@': { - templateUrl: templateUrl('inventories/hosts/hosts'), - controller: 'HostListController' - } - }, - ncyBreadcrumb: { - label: N_('HOSTS') - } - }); - - let hostAnsibleFacts = _.cloneDeep(ansibleFactsRoute); - hostAnsibleFacts.name = 'hosts.edit.ansible_facts'; - - let hostInsights = _.cloneDeep(insightsRoute); - hostInsights.name = 'hosts.edit.insights'; - - return Promise.all([ - hostTree - ]).then((generated) => { - return { - states: _.reduce(generated, (result, definition) => { - return result.concat(definition.states); - }, [ - stateExtender.buildDefinition(hostAnsibleFacts), - stateExtender.buildDefinition(hostInsights), - stateExtender.buildDefinition(hostGroupsRoute), - stateExtender.buildDefinition(hostGroupsAssociateRoute) - ]) - }; - }); - }; - - $stateProvider.state({ - name: 'hosts', - url: '/hosts', - lazyLoad: () => generateHostStates() - }); - $stateProvider.state({ name: 'inventories', url: '/inventories', diff --git a/awx/ui/client/src/inventories/completed_jobs/completed_jobs.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js similarity index 100% rename from awx/ui/client/src/inventories/completed_jobs/completed_jobs.list.js rename to awx/ui/client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js diff --git a/awx/ui/client/src/inventories/completed_jobs/completed_jobs.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.route.js similarity index 98% rename from awx/ui/client/src/inventories/completed_jobs/completed_jobs.route.js rename to awx/ui/client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.route.js index daddb74860..7b3d3167dd 100644 --- a/awx/ui/client/src/inventories/completed_jobs/completed_jobs.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.route.js @@ -1,4 +1,4 @@ -import { N_ } from '../../i18n'; +import { N_ } from '../../../../i18n'; export default { url: "/completed_jobs", diff --git a/awx/ui/client/src/inventories/completed_jobs/main.js b/awx/ui/client/src/inventories-hosts/inventories/related/completed-jobs/main.js similarity index 86% rename from awx/ui/client/src/inventories/completed_jobs/main.js rename to awx/ui/client/src/inventories-hosts/inventories/related/completed-jobs/main.js index 50c073719e..7326b4c18b 100644 --- a/awx/ui/client/src/inventories/completed_jobs/main.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/completed-jobs/main.js @@ -4,7 +4,7 @@ * All Rights Reserved *************************************************/ -import list from './completed_jobs.list'; +import list from './completed-jobs.list'; export default angular.module('inventoryCompletedJobs', []) diff --git a/awx/ui/client/src/inventories/groups/add/groups-add.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/add/groups-add.controller.js similarity index 86% rename from awx/ui/client/src/inventories/groups/add/groups-add.controller.js rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/add/groups-add.controller.js index f25959d1fe..9ede17bcf5 100644 --- a/awx/ui/client/src/inventories/groups/add/groups-add.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/add/groups-add.controller.js @@ -5,11 +5,11 @@ *************************************************/ export default ['$state', '$stateParams', '$scope', 'GroupForm', - 'ParseTypeChange', 'GenerateForm', 'inventoryData', 'GroupManageService', + 'ParseTypeChange', 'GenerateForm', 'inventoryData', 'GroupsService', 'GetChoices', 'GetBasePath', 'CreateSelect2', 'rbacUiControlService', 'ToJSON', function($state, $stateParams, $scope, GroupForm, ParseTypeChange, - GenerateForm, inventoryData, GroupManageService, GetChoices, + GenerateForm, inventoryData, GroupsService, GetChoices, GetBasePath, CreateSelect2, rbacUiControlService, ToJSON) { @@ -48,9 +48,9 @@ export default ['$state', '$stateParams', '$scope', 'GroupForm', inventory: inventoryData.id }; - GroupManageService.post(group).then(res => { + GroupsService.post(group).then(res => { if ($stateParams.group_id) { - return GroupManageService.associateGroup(res.data, $stateParams.group_id) + return GroupsService.associateGroup(res.data, $stateParams.group_id) .then(() => $state.go('^', null, { reload: true })); } else { $state.go('^.edit', { group_id: res.data.id }, { reload: true }); diff --git a/awx/ui/client/src/inventories/groups/add/groups-add.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/add/groups-add.route.js similarity index 92% rename from awx/ui/client/src/inventories/groups/add/groups-add.route.js rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/add/groups-add.route.js index 6e4a3ba974..7f9e58ff9f 100644 --- a/awx/ui/client/src/inventories/groups/add/groups-add.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/add/groups-add.route.js @@ -1,4 +1,4 @@ -import { N_ } from '../../../i18n'; +import { N_ } from '../../../../../i18n'; export default { name: "inventories.edit.groups.add", diff --git a/awx/ui/client/src/inventories/groups/add/main.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/add/main.js similarity index 100% rename from awx/ui/client/src/inventories/groups/add/main.js rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/add/main.js diff --git a/awx/ui/client/src/inventories/groups/edit/groups-edit.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/edit/groups-edit.controller.js similarity index 86% rename from awx/ui/client/src/inventories/groups/edit/groups-edit.controller.js rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/edit/groups-edit.controller.js index f4e235a061..c0a5e12097 100644 --- a/awx/ui/client/src/inventories/groups/edit/groups-edit.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/edit/groups-edit.controller.js @@ -5,9 +5,9 @@ *************************************************/ export default ['$state', '$stateParams', '$scope', 'ParseVariableString', 'rbacUiControlService', 'ToJSON', - 'ParseTypeChange', 'GroupManageService', 'GetChoices', 'GetBasePath', 'CreateSelect2', 'groupData', '$rootScope', + 'ParseTypeChange', 'GroupsService', 'GetChoices', 'GetBasePath', 'CreateSelect2', 'groupData', '$rootScope', function($state, $stateParams, $scope, ParseVariableString, rbacUiControlService, ToJSON, - ParseTypeChange, GroupManageService, GetChoices, GetBasePath, CreateSelect2, groupData, $rootScope) { + ParseTypeChange, GroupsService, GetChoices, GetBasePath, CreateSelect2, groupData, $rootScope) { init(); @@ -56,7 +56,7 @@ export default ['$state', '$stateParams', '$scope', 'ParseVariableString', 'rbac inventory: $scope.inventory, id: groupData.id }; - GroupManageService.put(group).then(() => $state.go($state.current, null, { reload: true })); + GroupsService.put(group).then(() => $state.go($state.current, null, { reload: true })); }; } diff --git a/awx/ui/client/src/inventories/groups/edit/groups-edit.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/edit/groups-edit.route.js similarity index 74% rename from awx/ui/client/src/inventories/groups/edit/groups-edit.route.js rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/edit/groups-edit.route.js index 6fe46593ad..77f3f33653 100644 --- a/awx/ui/client/src/inventories/groups/edit/groups-edit.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/edit/groups-edit.route.js @@ -18,8 +18,8 @@ export default { } }, resolve: { - groupData: ['$stateParams', 'GroupManageService', function($stateParams, GroupManageService) { - return GroupManageService.get({ id: $stateParams.group_id }).then(res => res.data.results[0]); + groupData: ['$stateParams', 'GroupsService', function($stateParams, GroupsService) { + return GroupsService.get({ id: $stateParams.group_id }).then(res => res.data.results[0]); }] } }; diff --git a/awx/ui/client/src/inventories/groups/edit/main.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/edit/main.js similarity index 100% rename from awx/ui/client/src/inventories/groups/edit/main.js rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/edit/main.js diff --git a/awx/ui/client/src/inventories/groups/factories/get-hosts-status-msg.factory.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/factories/get-hosts-status-msg.factory.js similarity index 100% rename from awx/ui/client/src/inventories/groups/factories/get-hosts-status-msg.factory.js rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/factories/get-hosts-status-msg.factory.js diff --git a/awx/ui/client/src/inventories/groups/groups.form.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/groups.form.js similarity index 100% rename from awx/ui/client/src/inventories/groups/groups.form.js rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/groups.form.js diff --git a/awx/ui/client/src/inventories/groups/groups.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/groups.list.js similarity index 67% rename from awx/ui/client/src/inventories/groups/groups.list.js rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/groups.list.js index 412dd737ee..07b0367d36 100644 --- a/awx/ui/client/src/inventories/groups/groups.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/groups.list.js @@ -77,43 +77,6 @@ export default { columnClass: 'col-lg-6 col-md-6 col-sm-6 col-xs-6 text-right', - // group_update: { - // //label: 'Sync', - // mode: 'all', - // ngClick: 'updateGroup(group)', - // awToolTip: "{{ group.launch_tooltip }}", - // dataTipWatch: "group.launch_tooltip", - // ngShow: "(group.status !== 'running' && group.status " + - // "!== 'pending' && group.status !== 'updating') && group.summary_fields.user_capabilities.start", - // ngClass: "group.launch_class", - // dataPlacement: "top", - // }, - // cancel: { - // //label: 'Cancel', - // mode: 'all', - // ngClick: "cancelUpdate(group.id)", - // awToolTip: "Cancel sync process", - // 'class': 'red-txt', - // ngShow: "(group.status == 'running' || group.status == 'pending' " + - // "|| group.status == 'updating') && group.summary_fields.user_capabilities.start", - // dataPlacement: "top", - // iconClass: "fa fa-minus-circle" - // }, - copy: { - mode: 'all', - ngClick: "copyMoveGroup(group.id)", - awToolTip: 'Copy or move group', - ngShow: "group.id > 0 && group.summary_fields.user_capabilities.copy", - dataPlacement: "top" - }, - // schedule: { - // mode: 'all', - // ngClick: "scheduleGroup(group.id)", - // awToolTip: "{{ group.group_schedule_tooltip }}", - // ngClass: "group.scm_type_class", - // dataPlacement: 'top', - // ngShow: "!(group.summary_fields.inventory_source.source === '')" - // }, edit: { //label: 'Edit', mode: 'all', @@ -134,7 +97,7 @@ export default { //label: 'Delete', mode: 'all', ngClick: "deleteGroup(group)", - awToolTip: 'Delete group', + awToolTip: 'Disassociate group', dataPlacement: "top", ngShow: "group.summary_fields.user_capabilities.delete" } diff --git a/awx/ui/client/src/inventories/groups/list/groups-list.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.controller.js similarity index 91% rename from awx/ui/client/src/inventories/groups/list/groups-list.controller.js rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.controller.js index c641419a98..fdcb27b9ba 100644 --- a/awx/ui/client/src/inventories/groups/list/groups-list.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.controller.js @@ -5,10 +5,10 @@ *************************************************/ export default ['$scope', '$rootScope', '$state', '$stateParams', 'GroupList', 'InventoryUpdate', - 'GroupManageService', 'CancelSourceUpdate', 'rbacUiControlService', 'GetBasePath', + 'GroupsService', 'CancelSourceUpdate', 'rbacUiControlService', 'GetBasePath', 'GetHostsStatusMsg', 'Dataset', 'Find', 'QuerySet', 'inventoryData', 'canAdd', function($scope, $rootScope, $state, $stateParams, GroupList, InventoryUpdate, - GroupManageService, CancelSourceUpdate, rbacUiControlService, GetBasePath, + GroupsService, CancelSourceUpdate, rbacUiControlService, GetBasePath, GetHostsStatusMsg, Dataset, Find, qs, inventoryData, canAdd){ let list = GroupList; @@ -102,7 +102,7 @@ switch($scope.deleteOption){ case 'promote': - GroupManageService.promote($scope.toDelete.id, $stateParams.inventory_id) + GroupsService.promote($scope.toDelete.id, $stateParams.inventory_id) .then(() => { if (parseInt($state.params.group_id) === $scope.toDelete.id) { $state.go("^", null, {reload: true}); @@ -115,7 +115,7 @@ }); break; default: - GroupManageService.delete($scope.toDelete.id).then(() => { + GroupsService.delete($scope.toDelete.id).then(() => { if (parseInt($state.params.group_id) === $scope.toDelete.id) { $state.go("^", null, {reload: true}); } else { @@ -128,7 +128,7 @@ } }; $scope.updateGroup = function(group) { - GroupManageService.getInventorySource({group: group.id}).then(res =>InventoryUpdate({ + GroupsService.getInventorySource({group: group.id}).then(res =>InventoryUpdate({ scope: $scope, group_id: group.id, url: res.data.results[0].related.update, @@ -141,10 +141,6 @@ CancelSourceUpdate({ scope: $scope, id: id }); }; - $scope.copyMoveGroup = function(id){ - $state.go('inventories.edit.groups.copyMoveGroup', {group_id: id, groups: $stateParams.groups}); - }; - var cleanUpStateChangeListener = $rootScope.$on('$stateChangeSuccess', function(event, toState, toParams) { if (toState.name === "inventories.edit.groups.edit") { $scope.rowBeingEdited = toParams.group_id; diff --git a/awx/ui/client/src/inventories/groups/list/groups-list.partial.html b/awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html similarity index 100% rename from awx/ui/client/src/inventories/groups/list/groups-list.partial.html rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html diff --git a/awx/ui/client/src/inventories/groups/list/groups-list.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.route.js similarity index 86% rename from awx/ui/client/src/inventories/groups/list/groups-list.route.js rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.route.js index e03af1c325..39dac7cca9 100644 --- a/awx/ui/client/src/inventories/groups/list/groups-list.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.route.js @@ -1,5 +1,5 @@ -import { N_ } from '../../../i18n'; -import {templateUrl} from '../../../shared/template-url/template-url.factory'; +import { N_ } from '../../../../../i18n'; +import {templateUrl} from '../../../../../shared/template-url/template-url.factory'; export default { name: "inventories.edit.groups", @@ -18,8 +18,8 @@ export default { return qs.search(path, $stateParams[`${list.iterator}_search`]); } ], - inventoryData: ['InventoryManageService', '$stateParams', function(InventoryManageService, $stateParams) { - return InventoryManageService.getInventory($stateParams.inventory_id).then(res => res.data); + inventoryData: ['InventoriesService', '$stateParams', function(InventoriesService, $stateParams) { + return InventoriesService.getInventory($stateParams.inventory_id).then(res => res.data); }], canAdd: ['rbacUiControlService', '$state', 'GetBasePath', '$stateParams', function(rbacUiControlService, $state, GetBasePath, $stateParams) { return rbacUiControlService.canAdd(GetBasePath('inventory') + $stateParams.inventory_id + "/groups") @@ -62,7 +62,7 @@ export default { mode: 'edit' }); // Include the custom group delete modal template - return $templateRequest(templateUrl('inventories/groups/list/groups-list')).then((template) => { + return $templateRequest(templateUrl('inventories-hosts/inventories/related/groups/list/groups-list')).then((template) => { return html.concat(template); }); }, diff --git a/awx/ui/client/src/inventories/groups/list/main.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/list/main.js similarity index 100% rename from awx/ui/client/src/inventories/groups/list/main.js rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/list/main.js diff --git a/awx/ui/client/src/inventories/groups/main.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/main.js similarity index 75% rename from awx/ui/client/src/inventories/groups/main.js rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/main.js index ab66437ace..a79bc5a620 100644 --- a/awx/ui/client/src/inventories/groups/main.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/main.js @@ -7,12 +7,11 @@ import groupList from './list/main'; import groupAdd from './add/main'; import groupEdit from './edit/main'; -import nestedGroups from './nested-groups/main'; -import nestedHosts from './nested-hosts/main'; import groupFormDefinition from './groups.form'; import groupListDefinition from './groups.list'; -import service from './groups.service'; import GetHostsStatusMsg from './factories/get-hosts-status-msg.factory'; +import nestedGroups from './related/nested-groups/main'; +import nestedHosts from './related/nested-hosts/main'; export default angular.module('group', [ @@ -24,5 +23,4 @@ export default ]) .factory('GroupForm', groupFormDefinition) .value('GroupList', groupListDefinition) - .factory('GetHostsStatusMsg', GetHostsStatusMsg) - .service('GroupManageService', service); + .factory('GetHostsStatusMsg', GetHostsStatusMsg); diff --git a/awx/ui/client/src/inventories/groups/nested-groups/nested-groups-add.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-add.controller.js similarity index 85% rename from awx/ui/client/src/inventories/groups/nested-groups/nested-groups-add.controller.js rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-add.controller.js index 1d97263e82..de61ced6b3 100644 --- a/awx/ui/client/src/inventories/groups/nested-groups/nested-groups-add.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-add.controller.js @@ -5,11 +5,11 @@ *************************************************/ export default ['$state', '$stateParams', '$scope', 'NestedGroupForm', - 'ParseTypeChange', 'GenerateForm', 'inventoryData', 'GroupManageService', + 'ParseTypeChange', 'GenerateForm', 'inventoryData', 'GroupsService', 'GetChoices', 'GetBasePath', 'CreateSelect2', 'rbacUiControlService', 'ToJSON', 'canAdd', function($state, $stateParams, $scope, NestedGroupForm, ParseTypeChange, - GenerateForm, inventoryData, GroupManageService, GetChoices, + GenerateForm, inventoryData, GroupsService, GetChoices, GetBasePath, CreateSelect2, rbacUiControlService, ToJSON, canAdd) { @@ -44,9 +44,9 @@ export default ['$state', '$stateParams', '$scope', 'NestedGroupForm', inventory: inventoryData.id }; - GroupManageService.post(group).then(res => { + GroupsService.post(group).then(res => { if ($stateParams.group_id) { - return GroupManageService.associateGroup(res.data, $stateParams.group_id) + return GroupsService.associateGroup(res.data, $stateParams.group_id) .then(() => $state.go('^', null, { reload: true })); } else { $state.go('^.edit', { group_id: res.data.id }, { reload: true }); diff --git a/awx/ui/client/src/inventories/groups/nested-groups/nested-groups-add.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-add.route.js similarity index 96% rename from awx/ui/client/src/inventories/groups/nested-groups/nested-groups-add.route.js rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-add.route.js index 90fe46817f..2aba06a290 100644 --- a/awx/ui/client/src/inventories/groups/nested-groups/nested-groups-add.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-add.route.js @@ -1,4 +1,4 @@ -import { N_ } from '../../../i18n'; +import { N_ } from '../../../../../../i18n'; export default { name: "inventories.edit.groups.edit.nested_groups.add", diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-associate.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-associate.route.js new file mode 100644 index 0000000000..6125e02da7 --- /dev/null +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-associate.route.js @@ -0,0 +1,33 @@ +export default { + name: 'inventories.edit.groups.edit.nested_groups.associate', + squashSearchUrl: true, + url: '/associate', + ncyBreadcrumb:{ + skip:true + }, + views: { + 'modal@inventories.edit.groups.edit': { + templateProvider: function() { + return ``; + }, + controller: function($scope, $q, GroupsService, $state){ + $scope.associateGroups = function(selectedItems){ + var deferred = $q.defer(); + return $q.all( _.map(selectedItems, (id) => GroupsService.associateGroup({id: id}, $state.params.group_id)) ) + .then( () =>{ + deferred.resolve(); + }, (error) => { + deferred.reject(error); + }); + }; + } + } + }, + onExit: function($state) { + if ($state.transition) { + $('#associate-groups-modal').modal('hide'); + $('.modal-backdrop').remove(); + $('body').removeClass('modal-open'); + } + }, +}; diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html new file mode 100644 index 0000000000..98a41a9bdf --- /dev/null +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html @@ -0,0 +1,35 @@ + diff --git a/awx/ui/client/src/inventories/groups/nested-groups/nested-groups-list.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-list.controller.js similarity index 61% rename from awx/ui/client/src/inventories/groups/nested-groups/nested-groups-list.controller.js rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-list.controller.js index ee1a0cc2d3..77db55e705 100644 --- a/awx/ui/client/src/inventories/groups/nested-groups/nested-groups-list.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-list.controller.js @@ -5,20 +5,21 @@ *************************************************/ export default ['$scope', '$rootScope', '$state', '$stateParams', 'NestedGroupListDefinition', 'InventoryUpdate', - 'GroupManageService', 'CancelSourceUpdate', 'rbacUiControlService', 'GetBasePath', - 'GetHostsStatusMsg', 'Dataset', 'Find', 'QuerySet', 'inventoryData', 'canAdd', + 'GroupsService', 'CancelSourceUpdate', 'rbacUiControlService', 'GetBasePath', + 'GetHostsStatusMsg', 'Dataset', 'Find', 'QuerySet', 'inventoryData', 'canAdd', 'groupData', 'ProcessErrors', function($scope, $rootScope, $state, $stateParams, NestedGroupListDefinition, InventoryUpdate, - GroupManageService, CancelSourceUpdate, rbacUiControlService, GetBasePath, - GetHostsStatusMsg, Dataset, Find, qs, inventoryData, canAdd){ + GroupsService, CancelSourceUpdate, rbacUiControlService, GetBasePath, + GetHostsStatusMsg, Dataset, Find, qs, inventoryData, canAdd, groupData, ProcessErrors){ let list = NestedGroupListDefinition; init(); function init(){ - $scope.inventory_id = $stateParams.inventory_id; - $scope.canAdhoc = inventoryData.summary_fields.user_capabilities.adhoc; - $scope.canAdd = canAdd; + $scope.inventory_id = $stateParams.inventory_id; + $scope.canAdhoc = inventoryData.summary_fields.user_capabilities.adhoc; + $scope.canAdd = canAdd; + $scope.disassociateFrom = groupData; // Search init $scope.list = list; @@ -72,8 +73,41 @@ {hosts_status_class: hosts_status.class}); } - $scope.createGroup = function(){ - $state.go('inventories.edit.groups.edit.nested_groups.add'); + $scope.disassociateGroup = function(group){ + $scope.toDisassociate = {}; + angular.extend($scope.toDisassociate, group); + $('#group-disassociate-modal').modal('show'); + }; + + $scope.confirmDisassociate = function(){ + + // Bind an even listener for the modal closing. Trying to $state.go() before the modal closes + // will mean that these two things are running async and the modal may not finish closing before + // the state finishes transitioning. + $('#group-disassociate-modal').off('hidden.bs.modal').on('hidden.bs.modal', function () { + // Remove the event handler so that we don't end up with multiple bindings + $('#group-disassociate-modal').off('hidden.bs.modal'); + // Reload the inventory manage page and show that the group has been removed + $state.go('.', null, {reload: true}); + }); + + let closeModal = function(){ + $('#group-disassociate-modal').modal('hide'); + $('body').removeClass('modal-open'); + $('.modal-backdrop').remove(); + }; + + GroupsService.disassociateGroup($scope.toDisassociate.id, $scope.disassociateFrom.id) + .then(() => { + closeModal(); + }).catch((error) => { + closeModal(); + ProcessErrors(null, error.data, error.status, null, { + hdr: 'Error!', + msg: 'Failed to disassociate group from parent group: POST returned status' + + error.status + }); + }); }; $scope.editGroup = function(id){ diff --git a/awx/ui/client/src/inventories/groups/nested-groups/nested-groups.form.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.form.js similarity index 100% rename from awx/ui/client/src/inventories/groups/nested-groups/nested-groups.form.js rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.form.js diff --git a/awx/ui/client/src/inventories/groups/nested-groups/nested-groups.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js similarity index 63% rename from awx/ui/client/src/inventories/groups/nested-groups/nested-groups.list.js rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js index 082eb3bfad..24f535429c 100644 --- a/awx/ui/client/src/inventories/groups/nested-groups/nested-groups.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js @@ -64,14 +64,26 @@ export default { // awToolTip: "{{ adhocButtonTipContents }}", // dataTipWatch: "adhocButtonTipContents" }, - create: { + add: { mode: 'all', - ngClick: "createGroup()", - awToolTip: "Create a new group", + type: 'buttonDropdown', + awToolTip: "Add a group", actionClass: 'btn List-buttonSubmit', - buttonContent: '+ ADD GROUP', + buttonContent: '+ ADD', ngShow: 'canAdd', dataPlacement: "top", + options: [ + { + optionContent: 'Existing Group', + optionSref: '.associate', + ngShow: 'canAdd' + }, + { + optionContent: 'New Group', + optionSref: '.add', + ngShow: 'canAdd' + } + ], } }, @@ -79,43 +91,6 @@ export default { columnClass: 'col-lg-6 col-md-6 col-sm-6 col-xs-6 text-right', - // group_update: { - // //label: 'Sync', - // mode: 'all', - // ngClick: 'updateGroup(group)', - // awToolTip: "{{ group.launch_tooltip }}", - // dataTipWatch: "group.launch_tooltip", - // ngShow: "(group.status !== 'running' && group.status " + - // "!== 'pending' && group.status !== 'updating') && group.summary_fields.user_capabilities.start", - // ngClass: "group.launch_class", - // dataPlacement: "top", - // }, - // cancel: { - // //label: 'Cancel', - // mode: 'all', - // ngClick: "cancelUpdate(group.id)", - // awToolTip: "Cancel sync process", - // 'class': 'red-txt', - // ngShow: "(group.status == 'running' || group.status == 'pending' " + - // "|| group.status == 'updating') && group.summary_fields.user_capabilities.start", - // dataPlacement: "top", - // iconClass: "fa fa-minus-circle" - // }, - copy: { - mode: 'all', - ngClick: "copyMoveGroup(nested_group.id)", - awToolTip: 'Copy or move group', - ngShow: "group.id > 0 && group.summary_fields.user_capabilities.copy", - dataPlacement: "top" - }, - // schedule: { - // mode: 'all', - // ngClick: "scheduleGroup(group.id)", - // awToolTip: "{{ group.group_schedule_tooltip }}", - // ngClass: "group.scm_type_class", - // dataPlacement: 'top', - // ngShow: "!(group.summary_fields.inventory_source.source === '')" - // }, edit: { //label: 'Edit', mode: 'all', @@ -135,10 +110,10 @@ export default { "delete": { //label: 'Delete', mode: 'all', - ngClick: "deleteGroup(nested_group)", + ngClick: "disassociateGroup(nested_group)", awToolTip: 'Delete group', dataPlacement: "top", - ngShow: "group.summary_fields.user_capabilities.delete" + ngShow: "nested_group.summary_fields.user_capabilities.delete" } } }; diff --git a/awx/ui/client/src/inventories/groups/nested-groups/nested-groups.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.route.js similarity index 71% rename from awx/ui/client/src/inventories/groups/nested-groups/nested-groups.route.js rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.route.js index a01c311f9c..46073b8124 100644 --- a/awx/ui/client/src/inventories/groups/nested-groups/nested-groups.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.route.js @@ -1,4 +1,7 @@ +import {templateUrl} from '../../../../../../shared/template-url/template-url.factory'; + export default { + name: 'inventories.edit.groups.edit.nested_groups', url: "/nested_groups?{nested_group_search:queryset}", params: { nested_group_search: { @@ -10,21 +13,24 @@ export default { squash: "" } }, + ncyBreadcrumb: { + parent: "inventories.edit.groups.edit", + label: "ASSOCIATED GROUPS" + }, views: { // 'related@inventories.edit.groups.edit': { 'related': { - templateProvider: function(NestedGroupListDefinition, generateList) { + templateProvider: function(NestedGroupListDefinition, generateList, $templateRequest) { let list = _.cloneDeep(NestedGroupListDefinition); let html = generateList.build({ list: list, mode: 'edit' }); - // Include the custom group delete modal template - // return $templateRequest(templateUrl('inventories/groups/list/groups-list')).then((template) => { - // return html.concat(template); - // }); - return html; + + return $templateRequest(templateUrl('inventories-hosts/inventories/related/groups/related/nested-groups/nested-groups-disassociate')).then((template) => { + return html.concat(template); + }); }, controller: 'NestedGroupsListController' } @@ -41,7 +47,7 @@ export default { path = interpolator({ $rootScope: $rootScope, $stateParams: $stateParams }); } if($stateParams.group_id){ - path = `api/v2/groups/${$stateParams.group_id}/children`; + path = GetBasePath('groups') + $stateParams.group_id + '/children'; } else if($stateParams.host_id){ path = GetBasePath('hosts') + $stateParams.host_id + '/all_groups'; @@ -49,16 +55,16 @@ export default { return qs.search(path, $stateParams[`${list.iterator}_search`]); } ], - host: ['$stateParams', 'HostManageService', function($stateParams, HostManageService) { + host: ['$stateParams', 'HostsService', function($stateParams, HostsService) { if($stateParams.host_id){ - return HostManageService.get({ id: $stateParams.host_id }).then(function(res) { + return HostsService.get({ id: $stateParams.host_id }).then(function(res) { return res.data.results[0]; }); } }], - inventoryData: ['InventoryManageService', '$stateParams', 'host', function(InventoryManageService, $stateParams, host) { + inventoryData: ['InventoriesService', '$stateParams', 'host', function(InventoriesService, $stateParams, host) { var id = ($stateParams.inventory_id) ? $stateParams.inventory_id : host.summary_fields.inventory.id; - return InventoryManageService.getInventory(id).then(res => res.data); + return InventoriesService.getInventory(id).then(res => res.data); }], canAdd: ['rbacUiControlService', '$state', 'GetBasePath', '$stateParams', function(rbacUiControlService, $state, GetBasePath, $stateParams) { return rbacUiControlService.canAdd(GetBasePath('inventory') + $stateParams.inventory_id + "/groups") diff --git a/awx/ui/client/src/inventories/groups/nested-groups/main.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/main.js similarity index 64% rename from awx/ui/client/src/inventories/groups/nested-groups/main.js rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/main.js index e846f24b36..4450f4b39a 100644 --- a/awx/ui/client/src/inventories/groups/nested-groups/main.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/main.js @@ -4,14 +4,14 @@ * All Rights Reserved *************************************************/ -import nestedGroupListDefinition from './nested-groups.list'; -import NestedGroupForm from './nested-groups.form'; -import controller from './nested-groups-list.controller'; -import addController from './nested-groups-add.controller'; +import nestedGroupListDefinition from './group-nested-groups.list'; +import controller from './group-nested-groups-list.controller'; +import addController from './group-nested-groups-add.controller'; +import NestedGroupForm from './group-nested-groups.form'; export default angular.module('nestedGroups', []) - .value('NestedGroupListDefinition', nestedGroupListDefinition) .factory('NestedGroupForm', NestedGroupForm) + .value('NestedGroupListDefinition', nestedGroupListDefinition) .controller('NestedGroupsListController', controller) .controller('NestedGroupsAddController', addController); diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-add.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-add.controller.js new file mode 100644 index 0000000000..4cb3e840bb --- /dev/null +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-add.controller.js @@ -0,0 +1,52 @@ +/************************************************* + * Copyright (c) 2016 Ansible, Inc. + * + * All Rights Reserved + *************************************************/ + +export default ['$state', '$stateParams', '$scope', 'RelatedHostsFormDefinition', 'ParseTypeChange', + 'GenerateForm', 'HostsService', 'rbacUiControlService', 'GetBasePath', 'ToJSON', 'canAdd', 'GroupsService', + function($state, $stateParams, $scope, RelatedHostsFormDefinition, ParseTypeChange, + GenerateForm, HostsService, rbacUiControlService, GetBasePath, ToJSON, canAdd, GroupsService) { + + init(); + + function init() { + $scope.canAdd = canAdd; + $scope.parseType = 'yaml'; + $scope.host = { enabled: true }; + // apply form definition's default field values + GenerateForm.applyDefaults(RelatedHostsFormDefinition, $scope); + + ParseTypeChange({ + scope: $scope, + field_id: 'host_host_variables', + variable: 'host_variables', + parse_variable: 'parseType' + }); + } + $scope.formCancel = function() { + $state.go('^'); + }; + $scope.toggleHostEnabled = function() { + if ($scope.host.has_inventory_sources){ + return; + } + $scope.host.enabled = !$scope.host.enabled; + }; + $scope.formSave = function(){ + var json_data = ToJSON($scope.parseType, $scope.host_variables, true), + params = { + variables: json_data,// $scope.variables === '---' || $scope.variables === '{}' ? null : $scope.variables, + name: $scope.name, + description: $scope.description, + enabled: $scope.host.enabled, + inventory: $stateParams.inventory_id + }; + HostsService.post(params).then(function(res) { + return GroupsService.associateHost(res.data, $stateParams.group_id) + .then(() => $state.go('^', null, { reload: true })); + }); + }; + } +]; diff --git a/awx/ui/client/src/inventories/groups/nested-hosts/nested-hosts-add.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-add.route.js similarity index 92% rename from awx/ui/client/src/inventories/groups/nested-hosts/nested-hosts-add.route.js rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-add.route.js index 107f971aed..438aa4a5f2 100644 --- a/awx/ui/client/src/inventories/groups/nested-hosts/nested-hosts-add.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-add.route.js @@ -1,4 +1,4 @@ -import { N_ } from '../../../i18n'; +import { N_ } from '../../../../../../i18n'; export default { name: "inventories.edit.groups.edit.nested_hosts.add", @@ -16,7 +16,7 @@ export default { related: false }); }, - controller: 'RelatedHostAddController' + controller: 'NestedHostsAddController' } }, resolve: { diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-associate.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-associate.route.js new file mode 100644 index 0000000000..df09d30d80 --- /dev/null +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-associate.route.js @@ -0,0 +1,33 @@ +export default { + name: 'inventories.edit.groups.edit.nested_hosts.associate', + squashSearchUrl: true, + url: '/associate', + ncyBreadcrumb:{ + skip:true + }, + views: { + 'modal@inventories.edit.groups.edit': { + templateProvider: function() { + return ``; + }, + controller: function($scope, $q, GroupsService, $state){ + $scope.associateHosts = function(selectedItems){ + var deferred = $q.defer(); + return $q.all( _.map(selectedItems, (id) => GroupsService.associateHost({id: id}, $state.params.group_id)) ) + .then( () =>{ + deferred.resolve(); + }, (error) => { + deferred.reject(error); + }); + }; + } + } + }, + onExit: function($state) { + if ($state.transition) { + $('#associate-groups-modal').modal('hide'); + $('.modal-backdrop').remove(); + $('body').removeClass('modal-open'); + } + }, +}; diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html new file mode 100644 index 0000000000..35628d953e --- /dev/null +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html @@ -0,0 +1,35 @@ + diff --git a/awx/ui/client/src/inventories/groups/nested-hosts/nested-hosts-list.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-list.controller.js similarity index 64% rename from awx/ui/client/src/inventories/groups/nested-hosts/nested-hosts-list.controller.js rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-list.controller.js index 813b99fee2..42ba8bfbbe 100644 --- a/awx/ui/client/src/inventories/groups/nested-hosts/nested-hosts-list.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-list.controller.js @@ -6,10 +6,10 @@ export default ['$scope', 'NestedHostsListDefinition', '$rootScope', 'GetBasePath', 'rbacUiControlService', 'Dataset', '$state', '$filter', 'Prompt', 'Wait', - 'HostManageService', 'SetStatus', 'canAdd', + 'HostsService', 'SetStatus', 'canAdd', 'GroupsService', 'ProcessErrors', 'groupData', function($scope, NestedHostsListDefinition, $rootScope, GetBasePath, rbacUiControlService, Dataset, $state, $filter, Prompt, Wait, - HostManageService, SetStatus, canAdd) { + HostsService, SetStatus, canAdd, GroupsService, ProcessErrors, groupData) { let list = NestedHostsListDefinition; @@ -18,6 +18,7 @@ export default ['$scope', 'NestedHostsListDefinition', '$rootScope', 'GetBasePat function init(){ $scope.canAdd = canAdd; $scope.enableSmartInventoryButton = false; + $scope.disassociateFrom = groupData; // Search init $scope.list = list; @@ -79,35 +80,47 @@ export default ['$scope', 'NestedHostsListDefinition', '$rootScope', 'GetBasePat }); } - $scope.createHost = function(){ - $state.go('inventories.edit.groups.edit.nested_hosts.add'); + $scope.associateHost = function(){ + $state.go('inventories.edit.groups.edit.nested_hosts.associate'); }; $scope.editHost = function(id){ - $state.go('inventories.edit.groups.edit.nested_hosts.edit', {host_id: id}); + $state.go('inventories.edit.hosts.edit', {host_id: id}); }; - $scope.deleteHost = function(id, name){ - var body = '
Are you sure you want to permanently delete the host below from the inventory?
' + $filter('sanitize')(name) + '
'; - var action = function(){ - delete $rootScope.promptActionBtnClass; - Wait('start'); - HostManageService.delete(id).then(() => { - $('#prompt-modal').modal('hide'); - if (parseInt($state.params.host_id) === id) { - $state.go("hosts", null, {reload: true}); - } else { - $state.go($state.current.name, null, {reload: true}); - } - Wait('stop'); - }); - }; - // Prompt depends on having $rootScope.promptActionBtnClass available... - Prompt({ - hdr: 'Delete Host', - body: body, - action: action, - actionText: 'DELETE', + $scope.disassociateHost = function(host){ + $scope.toDisassociate = {}; + angular.extend($scope.toDisassociate, host); + $('#host-disassociate-modal').modal('show'); + }; + + $scope.confirmDisassociate = function(){ + + // Bind an even listener for the modal closing. Trying to $state.go() before the modal closes + // will mean that these two things are running async and the modal may not finish closing before + // the state finishes transitioning. + $('#host-disassociate-modal').off('hidden.bs.modal').on('hidden.bs.modal', function () { + // Remove the event handler so that we don't end up with multiple bindings + $('#host-disassociate-modal').off('hidden.bs.modal'); + // Reload the inventory manage page and show that the group has been removed + $state.go('.', null, {reload: true}); }); - $rootScope.promptActionBtnClass = 'Modal-errorButton'; + + let closeModal = function(){ + $('#host-disassociate-modal').modal('hide'); + $('body').removeClass('modal-open'); + $('.modal-backdrop').remove(); + }; + + GroupsService.disassociateHost($scope.toDisassociate.id, $scope.disassociateFrom.id) + .then(() => { + closeModal(); + }).catch((error) => { + closeModal(); + ProcessErrors(null, error.data, error.status, null, { + hdr: 'Error!', + msg: 'Failed to disassociate host from group: POST returned status' + + error.status + }); + }); }; $scope.toggleHost = function(event, host) { @@ -119,15 +132,11 @@ export default ['$scope', 'NestedHostsListDefinition', '$rootScope', 'GetBasePat host.enabled = !host.enabled; - HostManageService.put(host).then(function(){ + HostsService.put(host).then(function(){ $state.go($state.current, null, {reload: true}); }); }; - $scope.smartInventory = function() { - $state.go('inventories.addSmartInventory'); - }; - $scope.systemTracking = function(){ var hostIds = _.map($scope.hostsSelected, (host) => host.id); $state.go('systemTracking', { @@ -145,8 +154,4 @@ export default ['$scope', 'NestedHostsListDefinition', '$rootScope', 'GetBasePat $state.go('^.^.^.adhoc', {pattern: pattern}); }; - - $scope.copyMoveHost = function(id) { - $state.go('inventories.edit.hosts.copyMoveHost', {host_id: id}); - }; }]; diff --git a/awx/ui/client/src/inventories/groups/nested-hosts/nested-hosts.form.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js similarity index 94% rename from awx/ui/client/src/inventories/groups/nested-hosts/nested-hosts.form.js rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js index b3f2eed211..37e207ce9f 100644 --- a/awx/ui/client/src/inventories/groups/nested-hosts/nested-hosts.form.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js @@ -119,13 +119,6 @@ function(i18n) { ngClick: "$state.go('inventories.edit.groups.edit.nested_hosts.edit.nested_groups')", title: i18n._('Groups'), iterator: 'nested_group' - }, - insights: { - name: 'insights', - awToolTip: i18n._('Please save before viewing Insights'), - dataPlacement: 'top', - title: i18n._('Insights'), - skipGenerator: true } } }; diff --git a/awx/ui/client/src/inventories/groups/nested-hosts/nested-hosts.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js similarity index 76% rename from awx/ui/client/src/inventories/groups/nested-hosts/nested-hosts.list.js rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js index f713e091a9..63afcd758e 100644 --- a/awx/ui/client/src/inventories/groups/nested-hosts/nested-hosts.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js @@ -4,6 +4,8 @@ * All Rights Reserved *************************************************/ +import { N_ } from '../../../../../../i18n'; + export default { name: 'nested_hosts', iterator: 'nested_host', @@ -19,6 +21,22 @@ export default { basePath: 'api/v2/groups/{{$stateParams.group_id}}/all_hosts/', fields: { + toggleHost: { + ngDisabled: 'host.has_inventory_sources', + label: '', + columnClass: 'List-staticColumn--toggle', + type: "toggle", + ngClick: "toggleHost($event, nested_host)", + awToolTip: "

" + + N_("Indicates if a host is available and should be included in running jobs.") + + "

" + + N_("For hosts that are part of an external" + + " inventory, this flag cannot be changed. It will be" + + " set by the inventory sync process.") + + "

", + dataPlacement: "right", + nosort: true, + }, active_failures: { label: '', iconOnly: true, @@ -50,13 +68,6 @@ export default { fieldActions: { columnClass: 'col-lg-6 col-md-4 col-sm-4 col-xs-5 text-right', - copy: { - mode: 'all', - ngClick: "copyMoveHost(nested_host.id)", - awToolTip: 'Copy or move host to another group', - dataPlacement: "top", - ngShow: 'nested_host.summary_fields.user_capabilities.edit' - }, edit: { //label: 'Edit', ngClick: "editHost(nested_host.id)", @@ -74,9 +85,9 @@ export default { }, "delete": { //label: 'Delete', - ngClick: "deleteHost(nested_host.id, nested_host.name)", + ngClick: "disassociateHost(nested_host)", icon: 'icon-trash', - awToolTip: 'Delete host', + awToolTip: 'Disassociate host', dataPlacement: 'top', ngShow: 'nested_host.summary_fields.user_capabilities.delete' } @@ -117,14 +128,26 @@ export default { actionClass: 'btn List-buttonDefault', buttonContent: 'REFRESH' }, - create: { + add: { mode: 'all', - ngClick: "createHost()", - awToolTip: "Create a new host", + type: 'buttonDropdown', + awToolTip: "Add a host", actionClass: 'btn List-buttonSubmit', - buttonContent: '+ ADD HOST', + buttonContent: '+ ADD', ngShow: 'canAdd', dataPlacement: "top", + options: [ + { + optionContent: 'Existing Host', + optionSref: '.associate', + ngShow: 'canAdd' + }, + { + optionContent: 'New Host', + optionSref: '.add', + ngShow: 'canAdd' + } + ], } } diff --git a/awx/ui/client/src/inventories/groups/nested-hosts/nested-hosts.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.route.js similarity index 77% rename from awx/ui/client/src/inventories/groups/nested-hosts/nested-hosts.route.js rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.route.js index 2182a522cf..b76fd8e9be 100644 --- a/awx/ui/client/src/inventories/groups/nested-hosts/nested-hosts.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.route.js @@ -1,4 +1,5 @@ -import { N_ } from '../../../i18n'; +import { N_ } from '../../../../../../i18n'; +import {templateUrl} from '../../../../../../shared/template-url/template-url.factory'; export default { name: "inventories.edit.groups.edit.nested_hosts", @@ -20,18 +21,16 @@ export default { views: { // 'related@inventories.edit.groups.edit': { 'related': { - templateProvider: function(NestedHostsListDefinition, generateList) { + templateProvider: function(NestedHostsListDefinition, generateList, $templateRequest) { let list = _.cloneDeep(NestedHostsListDefinition); let html = generateList.build({ list: list, mode: 'edit' }); - // Include the custom group delete modal template - // return $templateRequest(templateUrl('inventories/groups/list/groups-list')).then((template) => { - // return html.concat(template); - // }); - return html; + return $templateRequest(templateUrl('inventories-hosts/inventories/related/groups/related/nested-hosts/nested-hosts-disassociate')).then((template) => { + return html.concat(template); + }); }, controller: 'NestedHostsListController' } @@ -51,8 +50,8 @@ export default { return qs.search(path, $stateParams[`${list.iterator}_search`]); } ], - inventoryData: ['InventoryManageService', '$stateParams', function(InventoryManageService, $stateParams) { - return InventoryManageService.getInventory($stateParams.inventory_id).then(res => res.data); + inventoryData: ['InventoriesService', '$stateParams', function(InventoriesService, $stateParams) { + return InventoriesService.getInventory($stateParams.inventory_id).then(res => res.data); }], canAdd: ['rbacUiControlService', function(rbacUiControlService) { return rbacUiControlService.canAdd('hosts') diff --git a/awx/ui/client/src/inventories/groups/nested-hosts/main.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/main.js similarity index 56% rename from awx/ui/client/src/inventories/groups/nested-hosts/main.js rename to awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/main.js index 450a20e290..70bb5ae1b1 100644 --- a/awx/ui/client/src/inventories/groups/nested-hosts/main.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/main.js @@ -4,12 +4,14 @@ * All Rights Reserved *************************************************/ -import nestedHostsListDefinition from './nested-hosts.list'; -import nestedHostsFormDefinition from './nested-hosts.form'; -import controller from './nested-hosts-list.controller'; +import nestedHostsListDefinition from './group-nested-hosts.list'; +import nestedHostsFormDefinition from './group-nested-hosts.form'; +import controller from './group-nested-hosts-list.controller'; +import addController from './group-nested-hosts-add.controller'; export default angular.module('nestedHosts', []) .value('NestedHostsListDefinition', nestedHostsListDefinition) .factory('NestedHostsFormDefinition', nestedHostsFormDefinition) + .controller('NestedHostsAddController', addController) .controller('NestedHostsListController', controller); diff --git a/awx/ui/client/src/inventories/related-hosts/add/host-add.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/add/host-add.controller.js similarity index 68% rename from awx/ui/client/src/inventories/related-hosts/add/host-add.controller.js rename to awx/ui/client/src/inventories-hosts/inventories/related/hosts/add/host-add.controller.js index 1247d73979..e9694cebdb 100644 --- a/awx/ui/client/src/inventories/related-hosts/add/host-add.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/add/host-add.controller.js @@ -5,9 +5,9 @@ *************************************************/ export default ['$state', '$stateParams', '$scope', 'RelatedHostsFormDefinition', 'ParseTypeChange', - 'GenerateForm', 'HostManageService', 'rbacUiControlService', 'GetBasePath', 'ToJSON', 'canAdd', + 'GenerateForm', 'HostsService', 'rbacUiControlService', 'GetBasePath', 'ToJSON', 'canAdd', function($state, $stateParams, $scope, RelatedHostsFormDefinition, ParseTypeChange, - GenerateForm, HostManageService, rbacUiControlService, GetBasePath, ToJSON, canAdd) { + GenerateForm, HostsService, rbacUiControlService, GetBasePath, ToJSON, canAdd) { init(); @@ -43,15 +43,8 @@ export default ['$state', '$stateParams', '$scope', 'RelatedHostsFormDefinition' enabled: $scope.host.enabled, inventory: $stateParams.inventory_id }; - HostManageService.post(params).then(function(res) { - // assign the host to current group if not at the root level - if ($stateParams.group_id) { - HostManageService.associateGroup(res.data, $stateParams.group_id).then(function() { - $state.go('^.edit', { group_id: $stateParams.group_id, host_id: res.data.id }, { reload: true }); - }); - } else { - $state.go('^.edit', { host_id: res.data.id }, { reload: true }); - } + HostsService.post(params).then(function(res) { + $state.go('^.edit', { host_id: res.data.id }, { reload: true }); }); }; } diff --git a/awx/ui/client/src/inventories/related-hosts/add/host-add.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/add/host-add.route.js similarity index 93% rename from awx/ui/client/src/inventories/related-hosts/add/host-add.route.js rename to awx/ui/client/src/inventories-hosts/inventories/related/hosts/add/host-add.route.js index 456089f51f..7621eeb045 100644 --- a/awx/ui/client/src/inventories/related-hosts/add/host-add.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/add/host-add.route.js @@ -1,4 +1,4 @@ -import { N_ } from '../../../i18n'; +import { N_ } from '../../../../../i18n'; export default { name: "inventories.edit.hosts.add", diff --git a/awx/ui/client/src/inventories/related-hosts/add/main.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/add/main.js similarity index 100% rename from awx/ui/client/src/inventories/related-hosts/add/main.js rename to awx/ui/client/src/inventories-hosts/inventories/related/hosts/add/main.js diff --git a/awx/ui/client/src/inventories/related-hosts/edit/host-edit.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/edit/host-edit.controller.js similarity index 93% rename from awx/ui/client/src/inventories/related-hosts/edit/host-edit.controller.js rename to awx/ui/client/src/inventories-hosts/inventories/related/hosts/edit/host-edit.controller.js index 2dbe122bb5..4a66d48025 100644 --- a/awx/ui/client/src/inventories/related-hosts/edit/host-edit.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/edit/host-edit.controller.js @@ -5,8 +5,8 @@ *************************************************/ export default - ['$scope', '$state', '$stateParams', 'GenerateForm', 'ParseTypeChange', 'HostManageService', 'host', '$rootScope', - function($scope, $state, $stateParams, GenerateForm, ParseTypeChange, HostManageService, host, $rootScope){ + ['$scope', '$state', '$stateParams', 'GenerateForm', 'ParseTypeChange', 'HostsService', 'host', '$rootScope', + function($scope, $state, $stateParams, GenerateForm, ParseTypeChange, HostsService, host, $rootScope){ $scope.parseType = 'yaml'; $scope.formCancel = function(){ $state.go('^', null, {reload: true}); @@ -28,7 +28,7 @@ description: $scope.description, enabled: $scope.host.enabled }; - HostManageService.put(host).then(function(){ + HostsService.put(host).then(function(){ $state.go('.', null, {reload: true}); }); diff --git a/awx/ui/client/src/inventories/related-hosts/edit/host-edit.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/edit/host-edit.route.js similarity index 65% rename from awx/ui/client/src/inventories/related-hosts/edit/host-edit.route.js rename to awx/ui/client/src/inventories-hosts/inventories/related/hosts/edit/host-edit.route.js index 5bc5d264b5..53fb28d48f 100644 --- a/awx/ui/client/src/inventories/related-hosts/edit/host-edit.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/edit/host-edit.route.js @@ -7,11 +7,8 @@ export default { }, views: { 'hostForm@inventories': { - templateProvider: function(GenerateForm, RelatedHostsFormDefinition, NestedHostsFormDefinition, $stateParams) { + templateProvider: function(GenerateForm, RelatedHostsFormDefinition) { let form = RelatedHostsFormDefinition; - if($stateParams.group_id){ - form = NestedHostsFormDefinition; - } return GenerateForm.buildHTML(form, { mode: 'edit', related: false @@ -21,8 +18,8 @@ export default { } }, resolve: { - host: ['$stateParams', 'HostManageService', function($stateParams, HostManageService) { - return HostManageService.get({ id: $stateParams.host_id }).then(function(res) { + host: ['$stateParams', 'HostsService', function($stateParams, HostsService) { + return HostsService.get({ id: $stateParams.host_id }).then(function(res) { return res.data.results[0]; }); }] diff --git a/awx/ui/client/src/inventories/related-hosts/edit/main.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/edit/main.js similarity index 100% rename from awx/ui/client/src/inventories/related-hosts/edit/main.js rename to awx/ui/client/src/inventories-hosts/inventories/related/hosts/edit/main.js diff --git a/awx/ui/client/src/inventories/related-hosts/list/host-list.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js similarity index 93% rename from awx/ui/client/src/inventories/related-hosts/list/host-list.controller.js rename to awx/ui/client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js index 83694dfee3..140a83e9dd 100644 --- a/awx/ui/client/src/inventories/related-hosts/list/host-list.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js @@ -4,13 +4,13 @@ * All Rights Reserved *************************************************/ -// import HostManageService from './../hosts/host.service'; +// import HostsService from './../hosts/host.service'; export default ['$scope', 'ListDefinition', '$rootScope', 'GetBasePath', 'rbacUiControlService', 'Dataset', '$state', '$filter', 'Prompt', 'Wait', - 'HostManageService', 'SetStatus', 'canAdd', + 'HostsService', 'SetStatus', 'canAdd', function($scope, ListDefinition, $rootScope, GetBasePath, rbacUiControlService, Dataset, $state, $filter, Prompt, Wait, - HostManageService, SetStatus, canAdd) { + HostsService, SetStatus, canAdd) { let list = ListDefinition; @@ -94,7 +94,7 @@ export default ['$scope', 'ListDefinition', '$rootScope', 'GetBasePath', var action = function(){ delete $rootScope.promptActionBtnClass; Wait('start'); - HostManageService.delete(id).then(() => { + HostsService.delete(id).then(() => { $('#prompt-modal').modal('hide'); if (parseInt($state.params.host_id) === id) { $state.go("hosts", null, {reload: true}); @@ -123,7 +123,7 @@ export default ['$scope', 'ListDefinition', '$rootScope', 'GetBasePath', host.enabled = !host.enabled; - HostManageService.put(host).then(function(){ + HostsService.put(host).then(function(){ $state.go($state.current, null, {reload: true}); }); }; @@ -149,8 +149,4 @@ export default ['$scope', 'ListDefinition', '$rootScope', 'GetBasePath', $state.go('^.adhoc', {pattern: pattern}); }; - - $scope.copyMoveHost = function(id) { - $state.go('inventories.edit.hosts.copyMoveHost', {host_id: id}); - }; }]; diff --git a/awx/ui/client/src/inventories/related-hosts/list/main.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/list/main.js similarity index 100% rename from awx/ui/client/src/inventories/related-hosts/list/main.js rename to awx/ui/client/src/inventories-hosts/inventories/related/hosts/list/main.js diff --git a/awx/ui/client/src/inventories/related-hosts/main.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/main.js similarity index 86% rename from awx/ui/client/src/inventories/related-hosts/main.js rename to awx/ui/client/src/inventories-hosts/inventories/related/hosts/main.js index 023d0c3dab..08b0cdc5b6 100644 --- a/awx/ui/client/src/inventories/related-hosts/main.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/main.js @@ -10,13 +10,15 @@ import relatedHostsListDefinition from './related-host.list'; import relatedHostsFormDefinition from './related-host.form'; import relatedGroupsLabels from './related-groups-labels/main'; + import nestedGroups from './related/nested-groups/main'; export default angular.module('relatedHost', [ relatedHostAdd.name, relatedHostEdit.name, relatedHostList.name, - relatedGroupsLabels.name + relatedGroupsLabels.name, + nestedGroups.name ]) .factory('RelatedHostsFormDefinition', relatedHostsFormDefinition) .factory('RelatedHostsListDefinition', relatedHostsListDefinition); diff --git a/awx/ui/client/src/inventories/related-hosts/related-groups-labels/main.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/main.js similarity index 100% rename from awx/ui/client/src/inventories/related-hosts/related-groups-labels/main.js rename to awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/main.js diff --git a/awx/ui/client/src/inventories/related-hosts/related-groups-labels/relatedGroupsLabelsList.block.less b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.block.less similarity index 100% rename from awx/ui/client/src/inventories/related-hosts/related-groups-labels/relatedGroupsLabelsList.block.less rename to awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.block.less diff --git a/awx/ui/client/src/inventories/related-hosts/related-groups-labels/relatedGroupsLabelsList.directive.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.directive.js similarity index 97% rename from awx/ui/client/src/inventories/related-hosts/related-groups-labels/relatedGroupsLabelsList.directive.js rename to awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.directive.js index f8638403d9..e189d9e1a6 100644 --- a/awx/ui/client/src/inventories/related-hosts/related-groups-labels/relatedGroupsLabelsList.directive.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.directive.js @@ -13,7 +13,7 @@ export default return { restrict: 'E', scope: false, - templateUrl: templateUrl('inventories/related-hosts/related-groups-labels/relatedGroupsLabelsList'), + templateUrl: templateUrl('inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList'), link: function(scope, element, attrs) { scope.showDelete = attrs.showDelete === 'true'; scope.seeMoreInactive = true; diff --git a/awx/ui/client/src/inventories/related-hosts/related-groups-labels/relatedGroupsLabelsList.partial.html b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.partial.html similarity index 100% rename from awx/ui/client/src/inventories/related-hosts/related-groups-labels/relatedGroupsLabelsList.partial.html rename to awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.partial.html diff --git a/awx/ui/client/src/inventories/related-hosts/related-host.form.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.form.js similarity index 100% rename from awx/ui/client/src/inventories/related-hosts/related-host.form.js rename to awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.form.js diff --git a/awx/ui/client/src/inventories/related-hosts/related-host.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js similarity index 95% rename from awx/ui/client/src/inventories/related-hosts/related-host.list.js rename to awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js index 3222aed824..851327e90e 100644 --- a/awx/ui/client/src/inventories/related-hosts/related-host.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js @@ -88,13 +88,6 @@ export default ['i18n', function(i18n) { dataPlacement: 'top', ngShow: 'host.insights_system_id' }, - copy: { - mode: 'all', - ngClick: "copyMoveHost(host.id)", - awToolTip: 'Copy or move host to another group', - dataPlacement: "top", - ngShow: 'host.summary_fields.user_capabilities.edit' - }, edit: { //label: 'Edit', ngClick: "editHost(host)", diff --git a/awx/ui/client/src/inventories/related-hosts/related-host.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.route.js similarity index 85% rename from awx/ui/client/src/inventories/related-hosts/related-host.route.js rename to awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.route.js index b3ea2da30c..0c8f6cb23a 100644 --- a/awx/ui/client/src/inventories/related-hosts/related-host.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.route.js @@ -1,4 +1,4 @@ -import { N_ } from '../../i18n'; +import { N_ } from '../../../../i18n'; export default { name: "inventories.edit.hosts", @@ -56,19 +56,19 @@ export default { return qs.search(path, $stateParams[`${list.iterator}_search`]); } ], - hostsUrl: ['InventoryManageService', '$stateParams', function(InventoryManageService, $stateParams) { + hostsUrl: ['InventoriesService', '$stateParams', function(InventoriesService, $stateParams) { return $stateParams.group && $stateParams.group.length > 0 ? // nested context - provide all hosts managed by nodes - InventoryManageService.childHostsUrl(_.last($stateParams.group)) : + InventoriesService.childHostsUrl(_.last($stateParams.group)) : // root context - provide all hosts in an inventory - InventoryManageService.rootHostsUrl($stateParams.inventory_id); + InventoriesService.rootHostsUrl($stateParams.inventory_id); }], hostsDataset: ['ListDefinition', 'QuerySet', '$stateParams', 'hostsUrl', (list, qs, $stateParams, hostsUrl) => { let path = hostsUrl; return qs.search(path, $stateParams[`${list.iterator}_search`]); }], - inventoryData: ['InventoryManageService', '$stateParams', function(InventoryManageService, $stateParams) { - return InventoryManageService.getInventory($stateParams.inventory_id).then(res => res.data); + inventoryData: ['InventoriesService', '$stateParams', function(InventoriesService, $stateParams) { + return InventoriesService.getInventory($stateParams.inventory_id).then(res => res.data); }], canAdd: ['rbacUiControlService', function(rbacUiControlService) { return rbacUiControlService.canAdd('hosts') diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-associate.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-associate.route.js new file mode 100644 index 0000000000..2b9a865b18 --- /dev/null +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-associate.route.js @@ -0,0 +1,33 @@ +export default { + name: 'inventories.edit.hosts.edit.nested_groups.associate', + squashSearchUrl: true, + url: '/associate', + ncyBreadcrumb:{ + skip:true + }, + views: { + 'modal@inventories.edit.hosts.edit': { + templateProvider: function() { + return ``; + }, + controller: function($scope, $q, GroupsService, $state){ + $scope.associateGroups = function(selectedItems){ + var deferred = $q.defer(); + return $q.all( _.map(selectedItems, (id) => GroupsService.associateHost({id: parseInt($state.params.host_id)}, id)) ) + .then( () =>{ + deferred.resolve(); + }, (error) => { + deferred.reject(error); + }); + }; + } + } + }, + onExit: function($state) { + if ($state.transition) { + $('#associate-groups-modal').modal('hide'); + $('.modal-backdrop').remove(); + $('body').removeClass('modal-open'); + } + }, +}; diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html new file mode 100644 index 0000000000..81fae5230c --- /dev/null +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate.partial.html @@ -0,0 +1,35 @@ + diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-list.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-list.controller.js new file mode 100644 index 0000000000..34440156e1 --- /dev/null +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-list.controller.js @@ -0,0 +1,122 @@ +/************************************************* + * Copyright (c) 2016 Ansible, Inc. + * + * All Rights Reserved + *************************************************/ + export default + ['$scope', '$rootScope', '$state', '$stateParams', 'HostNestedGroupListDefinition', 'InventoryUpdate', + 'GroupsService', 'CancelSourceUpdate', 'rbacUiControlService', 'GetBasePath', + 'GetHostsStatusMsg', 'Dataset', 'Find', 'QuerySet', 'inventoryData', 'canAdd', 'ProcessErrors', 'host', + function($scope, $rootScope, $state, $stateParams, HostNestedGroupListDefinition, InventoryUpdate, + GroupsService, CancelSourceUpdate, rbacUiControlService, GetBasePath, + GetHostsStatusMsg, Dataset, Find, qs, inventoryData, canAdd, ProcessErrors, host){ + + let list = HostNestedGroupListDefinition; + + init(); + + function init(){ + $scope.toDisassociate = host; + $scope.inventory_id = $stateParams.inventory_id; + $scope.canAdhoc = inventoryData.summary_fields.user_capabilities.adhoc; + $scope.canAdd = canAdd; + + // Search init + $scope.list = list; + $scope[`${list.iterator}_dataset`] = Dataset.data; + $scope[list.name] = $scope[`${list.iterator}_dataset`].results; + + $scope.$watchCollection(list.name, function(){ + _.forEach($scope[list.name], buildStatusIndicators); + }); + + $scope.$on('selectedOrDeselected', function(e, value) { + let item = value.value; + + if (value.isSelected) { + if(!$scope.groupsSelected) { + $scope.groupsSelected = []; + } + $scope.groupsSelected.push(item); + } else { + _.remove($scope.groupsSelected, { id: item.id }); + if($scope.groupsSelected.length === 0) { + $scope.groupsSelected = null; + } + } + }); + + } + + function buildStatusIndicators(group){ + if (group === undefined || group === null) { + group = {}; + } + + let hosts_status; + + hosts_status = GetHostsStatusMsg({ + active_failures: group.hosts_with_active_failures, + total_hosts: group.total_hosts, + inventory_id: $scope.inventory_id, + group_id: group.id + }); + _.assign(group, + {hosts_status_tip: hosts_status.tooltip}, + {hosts_status_class: hosts_status.class}); + } + + $scope.associateGroup = function() { + $state.go('.associate'); + }; + + $scope.disassociateGroup = function(group){ + $scope.disassociateFrom = group; + $('#group-disassociate-modal').modal('show'); + }; + + $scope.confirmDisassociate = function(){ + + // Bind an even listener for the modal closing. Trying to $state.go() before the modal closes + // will mean that these two things are running async and the modal may not finish closing before + // the state finishes transitioning. + $('#group-disassociate-modal').off('hidden.bs.modal').on('hidden.bs.modal', function () { + // Remove the event handler so that we don't end up with multiple bindings + $('#group-disassociate-modal').off('hidden.bs.modal'); + // Reload the inventory manage page and show that the group has been removed + $state.go('.', null, {reload: true}); + }); + + let closeModal = function(){ + $('#group-disassociate-modal').modal('hide'); + $('body').removeClass('modal-open'); + $('.modal-backdrop').remove(); + }; + + GroupsService.disassociateHost($scope.toDisassociate.id, $scope.disassociateFrom.id) + .then(() => { + closeModal(); + }).catch((error) => { + closeModal(); + ProcessErrors(null, error.data, error.status, null, { + hdr: 'Error!', + msg: 'Failed to disassociate group from parent group: POST returned status' + + error.status + }); + }); + }; + + $scope.editGroup = function(id){ + $state.go('inventories.edit.groups.edit', {group_id: id}); + }; + + $scope.setAdhocPattern = function(){ + var pattern = _($scope.groupsSelected) + .map(function(item){ + return item.name; + }).value().join(':'); + + $state.go('^.^.^.adhoc', {pattern: pattern}); + }; + + }]; diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js new file mode 100644 index 0000000000..9c2718688c --- /dev/null +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js @@ -0,0 +1,107 @@ +/************************************************* + * Copyright (c) 2017 Ansible, Inc. + * + * All Rights Reserved + *************************************************/ + +export default { + name: 'nested_groups', + iterator: 'nested_group', + editTitle: '{{ inventory.name }}', + well: true, + wellOverride: true, + index: false, + hover: true, + multiSelect: true, + trackBy: 'nested_group.id', + basePath: 'api/v2/inventories/{{$stateParams.inventory_id}}/root_groups/', + + fields: { + failed_hosts: { + label: '', + nosort: true, + mode: 'all', + iconOnly: true, + awToolTip: "{{ nested_group.hosts_status_tip }}", + dataPlacement: "top", + icon: "{{ 'fa icon-job-' + nested_group.hosts_status_class }}", + columnClass: 'status-column List-staticColumn--smallStatus' + }, + name: { + label: 'Groups', + key: true, + + // ngClick: "groupSelect(group.id)", + ngClick: "editGroup(nested_group.id)", + columnClass: 'col-lg-6 col-md-6 col-sm-6 col-xs-6', + class: 'InventoryManage-breakWord', + } + }, + + actions: { + refresh: { + mode: 'all', + awToolTip: "Refresh the page", + ngClick: "refreshGroups()", + ngShow: "socketStatus == 'error'", + actionClass: 'btn List-buttonDefault', + buttonContent: 'REFRESH' + }, + launch: { + mode: 'all', + ngDisabled: '!groupsSelected', + ngClick: 'setAdhocPattern()', + awToolTip: "Select an inventory source by clicking the check box beside it. The inventory source can be a single group or host, a selection of multiple hosts, or a selection of multiple groups.", + dataPlacement: 'top', + actionClass: 'btn List-buttonDefault', + buttonContent: 'RUN COMMANDS', + showTipWhenDisabled: true, + tooltipInnerClass: "Tooltip-wide", + ngShow: 'canAdhoc' + // TODO: set up a tip watcher and change text based on when + // things are selected/not selected. This is started and + // commented out in the inventory controller within the watchers. + // awToolTip: "{{ adhocButtonTipContents }}", + // dataTipWatch: "adhocButtonTipContents" + }, + associate: { + mode: 'all', + ngClick: 'associateGroup()', + awToolTip: "Associate an existing group", + actionClass: 'btn List-buttonSubmit', + buttonContent: '+ ASSOCIATE GROUP', + ngShow: 'canAdd', + dataPlacement: "top", + } + }, + + fieldActions: { + + columnClass: 'col-lg-6 col-md-6 col-sm-6 col-xs-6 text-right', + + edit: { + //label: 'Edit', + mode: 'all', + ngClick: "editGroup(nested_group.id)", + awToolTip: 'Edit group', + dataPlacement: "top", + ngShow: "nested_group.summary_fields.user_capabilities.edit" + }, + view: { + //label: 'Edit', + mode: 'all', + ngClick: "editGroup(nested_group.id)", + awToolTip: 'View group', + dataPlacement: "top", + ngShow: "!nested_group.summary_fields.user_capabilities.edit" + }, + "delete": { + //label: 'Delete', + mode: 'all', + ngClick: "disassociateGroup(nested_group)", + awToolTip: 'Delete group', + dataPlacement: "top", + ngShow: "nested_group.summary_fields.user_capabilities.delete" + } + } +}; diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.route.js new file mode 100644 index 0000000000..b715097b8a --- /dev/null +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.route.js @@ -0,0 +1,79 @@ +import {templateUrl} from '../../../../../../shared/template-url/template-url.factory'; + +export default { + name: 'inventories.edit.hosts.edit.nested_groups', + url: "/nested_groups?{nested_group_search:queryset}", + params: { + nested_group_search: { + value: { + page_size: "20", + order_by: "name" + }, + dynamic: true, + squash: "" + } + }, + ncyBreadcrumb: { + parent: "inventories.edit.hosts.edit", + label: "ASSOCIATED GROUPS" + }, + views: { + // 'related@inventories.edit.groups.edit': { + 'related': { + templateProvider: function(HostNestedGroupListDefinition, generateList, $templateRequest) { + let list = _.cloneDeep(HostNestedGroupListDefinition); + + let html = generateList.build({ + list: list, + mode: 'edit' + }); + + return $templateRequest(templateUrl('inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-disassociate')).then((template) => { + return html.concat(template); + }); + }, + controller: 'HostNestedGroupsListController' + } + }, + resolve: { + Dataset: ['HostNestedGroupListDefinition', 'QuerySet', '$stateParams', 'GetBasePath', '$interpolate', '$rootScope', + (list, qs, $stateParams, GetBasePath, $interpolate, $rootScope) => { + // allow related list definitions to use interpolated $rootScope / $stateParams in basePath field + let path, interpolator; + if (GetBasePath(list.basePath)) { + path = GetBasePath(list.basePath); + } else { + interpolator = $interpolate(list.basePath); + path = interpolator({ $rootScope: $rootScope, $stateParams: $stateParams }); + } + if($stateParams.group_id){ + path = GetBasePath('groups') + $stateParams.group_id + '/children'; + } + else if($stateParams.host_id){ + path = GetBasePath('hosts') + $stateParams.host_id + '/all_groups'; + } + return qs.search(path, $stateParams[`${list.iterator}_search`]); + } + ], + host: ['$stateParams', 'HostsService', function($stateParams, HostsService) { + if($stateParams.host_id){ + return HostsService.get({ id: $stateParams.host_id }).then(function(res) { + return res.data.results[0]; + }); + } + }], + inventoryData: ['InventoriesService', '$stateParams', 'host', function(InventoriesService, $stateParams, host) { + var id = ($stateParams.inventory_id) ? $stateParams.inventory_id : host.summary_fields.inventory.id; + return InventoriesService.getInventory(id).then(res => res.data); + }], + canAdd: ['rbacUiControlService', '$state', 'GetBasePath', '$stateParams', function(rbacUiControlService, $state, GetBasePath, $stateParams) { + return rbacUiControlService.canAdd(GetBasePath('inventory') + $stateParams.inventory_id + "/groups") + .then(function(res) { + return res.canAdd; + }) + .catch(function() { + return false; + }); + }] + } +}; diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/main.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/main.js new file mode 100644 index 0000000000..ea8695abbf --- /dev/null +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/main.js @@ -0,0 +1,13 @@ +/************************************************* + * Copyright (c) 2017 Ansible, Inc. + * + * All Rights Reserved + *************************************************/ + +import HostNestedGroupListDefinition from './host-nested-groups.list'; +import HostNestedGroupsListController from './host-nested-groups-list.controller'; + +export default + angular.module('hostNestedGroups', []) + .value('HostNestedGroupListDefinition', HostNestedGroupListDefinition) + .controller('HostNestedGroupsListController', HostNestedGroupsListController); diff --git a/awx/ui/client/src/inventories/sources/add/main.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/add/main.js similarity index 100% rename from awx/ui/client/src/inventories/sources/add/main.js rename to awx/ui/client/src/inventories-hosts/inventories/related/sources/add/main.js diff --git a/awx/ui/client/src/inventories/sources/add/sources-add.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js similarity index 98% rename from awx/ui/client/src/inventories/sources/add/sources-add.controller.js rename to awx/ui/client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js index f5db7e9076..d51c64a105 100644 --- a/awx/ui/client/src/inventories/sources/add/sources-add.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js @@ -5,12 +5,12 @@ *************************************************/ export default ['$state', '$stateParams', '$scope', 'SourcesFormDefinition', - 'ParseTypeChange', 'GenerateForm', 'inventoryData', 'GroupManageService', + 'ParseTypeChange', 'GenerateForm', 'inventoryData', 'GroupsService', 'GetChoices', 'GetBasePath', 'CreateSelect2', 'GetSourceTypeOptions', 'rbacUiControlService', 'ToJSON', 'SourcesService', 'Empty', 'Wait', 'Rest', 'Alert', 'ProcessErrors', 'inventorySourcesOptions', function($state, $stateParams, $scope, SourcesFormDefinition, ParseTypeChange, - GenerateForm, inventoryData, GroupManageService, GetChoices, + GenerateForm, inventoryData, GroupsService, GetChoices, GetBasePath, CreateSelect2, GetSourceTypeOptions, rbacUiControlService, ToJSON, SourcesService, Empty, Wait, Rest, Alert, ProcessErrors, inventorySourcesOptions) { diff --git a/awx/ui/client/src/inventories/sources/add/sources-add.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/add/sources-add.route.js similarity index 74% rename from awx/ui/client/src/inventories/sources/add/sources-add.route.js rename to awx/ui/client/src/inventories-hosts/inventories/related/sources/add/sources-add.route.js index dda3d69bd6..897a8446ba 100644 --- a/awx/ui/client/src/inventories/sources/add/sources-add.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/add/sources-add.route.js @@ -1,4 +1,4 @@ -import { N_ } from '../../../i18n'; +import { N_ } from '../../../../../i18n'; export default { name: "inventories.edit.inventory_sources.add", @@ -20,8 +20,8 @@ export default { } }, resolve: { - inventorySourcesOptions: ['InventoryManageService', '$stateParams', function(InventoryManageService, $stateParams) { - return InventoryManageService.inventorySourcesOptions($stateParams.inventory_id) + inventorySourcesOptions: ['InventoriesService', '$stateParams', function(InventoriesService, $stateParams) { + return InventoriesService.inventorySourcesOptions($stateParams.inventory_id) .then(function(res) { return res.data; }); diff --git a/awx/ui/client/src/inventories/sources/edit/main.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/main.js similarity index 100% rename from awx/ui/client/src/inventories/sources/edit/main.js rename to awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/main.js diff --git a/awx/ui/client/src/inventories/sources/edit/sources-edit.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js similarity index 99% rename from awx/ui/client/src/inventories/sources/edit/sources-edit.controller.js rename to awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js index 04caacb9a0..254f33d946 100644 --- a/awx/ui/client/src/inventories/sources/edit/sources-edit.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js @@ -5,12 +5,12 @@ *************************************************/ export default ['$state', '$stateParams', '$scope', 'ParseVariableString', - 'rbacUiControlService', 'ToJSON', 'ParseTypeChange', 'GroupManageService', + 'rbacUiControlService', 'ToJSON', 'ParseTypeChange', 'GroupsService', 'GetChoices', 'GetBasePath', 'CreateSelect2', 'GetSourceTypeOptions', 'inventorySourceData', 'SourcesService', 'inventoryData', 'inventorySourcesOptions', 'Empty', 'Wait', 'Rest', 'Alert', 'ProcessErrors', function($state, $stateParams, $scope, ParseVariableString, - rbacUiControlService, ToJSON,ParseTypeChange, GroupManageService, + rbacUiControlService, ToJSON,ParseTypeChange, GroupsService, GetChoices, GetBasePath, CreateSelect2, GetSourceTypeOptions, inventorySourceData, SourcesService, inventoryData, inventorySourcesOptions, Empty, Wait, Rest, Alert, ProcessErrors) { diff --git a/awx/ui/client/src/inventories/sources/edit/sources-edit.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.route.js similarity index 79% rename from awx/ui/client/src/inventories/sources/edit/sources-edit.route.js rename to awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.route.js index a5ac85c1a6..4560a1f6ba 100644 --- a/awx/ui/client/src/inventories/sources/edit/sources-edit.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.route.js @@ -1,4 +1,4 @@ -import { N_ } from '../../../i18n'; +import { N_ } from '../../../../../i18n'; export default { name: "inventories.edit.inventory_sources.edit", @@ -23,8 +23,8 @@ export default { inventorySourceData: ['$stateParams', 'SourcesService', function($stateParams, SourcesService) { return SourcesService.get({id: $stateParams.inventory_source_id }).then(res => res.data.results[0]); }], - inventorySourcesOptions: ['InventoryManageService', '$stateParams', function(InventoryManageService, $stateParams) { - return InventoryManageService.inventorySourcesOptions($stateParams.inventory_id) + inventorySourcesOptions: ['InventoriesService', '$stateParams', function(InventoriesService, $stateParams) { + return InventoriesService.inventorySourcesOptions($stateParams.inventory_id) .then(function(res) { return res.data; }); diff --git a/awx/ui/client/src/inventories/sources/edit/sources-notifications.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-notifications.route.js similarity index 98% rename from awx/ui/client/src/inventories/sources/edit/sources-notifications.route.js rename to awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-notifications.route.js index 1596bfb9d7..b739f2287d 100644 --- a/awx/ui/client/src/inventories/sources/edit/sources-notifications.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-notifications.route.js @@ -1,4 +1,4 @@ -import { N_ } from '../../../i18n'; +import { N_ } from '../../../../../i18n'; export default { searchPrefix: 'notification', diff --git a/awx/ui/client/src/inventories/sources/factories/cancel-source-update.factory.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/cancel-source-update.factory.js similarity index 100% rename from awx/ui/client/src/inventories/sources/factories/cancel-source-update.factory.js rename to awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/cancel-source-update.factory.js diff --git a/awx/ui/client/src/inventories/sources/factories/get-source-type-options.factory.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/get-source-type-options.factory.js similarity index 100% rename from awx/ui/client/src/inventories/sources/factories/get-source-type-options.factory.js rename to awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/get-source-type-options.factory.js diff --git a/awx/ui/client/src/inventories/sources/factories/get-sync-status-msg.factory.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/get-sync-status-msg.factory.js similarity index 100% rename from awx/ui/client/src/inventories/sources/factories/get-sync-status-msg.factory.js rename to awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/get-sync-status-msg.factory.js diff --git a/awx/ui/client/src/inventories/sources/factories/view-update-status.factory.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/view-update-status.factory.js similarity index 100% rename from awx/ui/client/src/inventories/sources/factories/view-update-status.factory.js rename to awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/view-update-status.factory.js diff --git a/awx/ui/client/src/inventories/sources/list/main.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/main.js similarity index 100% rename from awx/ui/client/src/inventories/sources/list/main.js rename to awx/ui/client/src/inventories-hosts/inventories/related/sources/list/main.js diff --git a/awx/ui/client/src/inventories/sources/list/schedule/sources-schedule-add.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule-add.route.js similarity index 71% rename from awx/ui/client/src/inventories/sources/list/schedule/sources-schedule-add.route.js rename to awx/ui/client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule-add.route.js index 27faa728ed..cb7ac3efb7 100644 --- a/awx/ui/client/src/inventories/sources/list/schedule/sources-schedule-add.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule-add.route.js @@ -1,5 +1,5 @@ -import { N_ } from '../../../../i18n'; -import {templateUrl} from '../../../../shared/template-url/template-url.factory'; +import { N_ } from '../../../../../../i18n'; +import {templateUrl} from '../../../../../../shared/template-url/template-url.factory'; export default { name: 'inventories.edit.inventory_sources.edit.schedules.add', diff --git a/awx/ui/client/src/inventories/sources/list/schedule/sources-schedule-edit.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule-edit.route.js similarity index 79% rename from awx/ui/client/src/inventories/sources/list/schedule/sources-schedule-edit.route.js rename to awx/ui/client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule-edit.route.js index f43c9b3def..0fc89af835 100644 --- a/awx/ui/client/src/inventories/sources/list/schedule/sources-schedule-edit.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule-edit.route.js @@ -1,4 +1,4 @@ -import {templateUrl} from '../../../../shared/template-url/template-url.factory'; +import {templateUrl} from '../../../../../../shared/template-url/template-url.factory'; export default { name: 'inventories.edit.inventory_sources.edit.schedules.edit', diff --git a/awx/ui/client/src/inventories/sources/list/schedule/sources-schedule.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule.route.js similarity index 98% rename from awx/ui/client/src/inventories/sources/list/schedule/sources-schedule.route.js rename to awx/ui/client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule.route.js index 3edae958d1..73c200fa97 100644 --- a/awx/ui/client/src/inventories/sources/list/schedule/sources-schedule.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule.route.js @@ -1,4 +1,4 @@ -import { N_ } from '../../../../i18n'; +import { N_ } from '../../../../../../i18n'; export default { name: 'inventories.edit.inventory_sources.edit.schedules', diff --git a/awx/ui/client/src/inventories/sources/list/sources-list.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js similarity index 100% rename from awx/ui/client/src/inventories/sources/list/sources-list.controller.js rename to awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js diff --git a/awx/ui/client/src/inventories/sources/list/sources-list.partial.html b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html similarity index 100% rename from awx/ui/client/src/inventories/sources/list/sources-list.partial.html rename to awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html diff --git a/awx/ui/client/src/inventories/sources/list/sources-list.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.route.js similarity index 80% rename from awx/ui/client/src/inventories/sources/list/sources-list.route.js rename to awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.route.js index 5664f38ac3..a6fb5899fd 100644 --- a/awx/ui/client/src/inventories/sources/list/sources-list.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.route.js @@ -1,4 +1,4 @@ -import { N_ } from '../../../i18n'; +import { N_ } from '../../../../../i18n'; export default { name: "inventories.edit.inventory_sources", @@ -32,10 +32,6 @@ export default { list: list, mode: 'edit' }); - // Include the custom group delete modal template - // return $templateRequest(templateUrl('inventories/groups/list/groups-list')).then((template) => { - // return html.concat(template); - // }); return html; }, controller: 'SourcesListController' @@ -58,8 +54,8 @@ export default { return qs.search(path, $stateParams[`${list.iterator}_search`]); } ], - inventoryData: ['InventoryManageService', '$stateParams', function(InventoryManageService, $stateParams) { - return InventoryManageService.getInventory($stateParams.inventory_id).then(res => res.data); + inventoryData: ['InventoriesService', '$stateParams', function(InventoriesService, $stateParams) { + return InventoriesService.getInventory($stateParams.inventory_id).then(res => res.data); }], canAdd: ['rbacUiControlService', 'GetBasePath', '$stateParams', function(rbacUiControlService, GetBasePath, $stateParams) { return rbacUiControlService.canAdd(GetBasePath('inventory') + $stateParams.inventory_id + "/inventory_sources") @@ -70,8 +66,8 @@ export default { return false; }); }], - hasSyncableSources: ['InventoryManageService', '$stateParams', function(InventoryManageService, $stateParams) { - return InventoryManageService.updateInventorySourcesGet($stateParams.inventory_id) + hasSyncableSources: ['InventoriesService', '$stateParams', function(InventoriesService, $stateParams) { + return InventoriesService.updateInventorySourcesGet($stateParams.inventory_id) .then(function(res) { let canUpdateFound = false; if(res.data && res.data.length > 0) { diff --git a/awx/ui/client/src/inventories/sources/lookup/sources-lookup-credential.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/lookup/sources-lookup-credential.route.js similarity index 100% rename from awx/ui/client/src/inventories/sources/lookup/sources-lookup-credential.route.js rename to awx/ui/client/src/inventories-hosts/inventories/related/sources/lookup/sources-lookup-credential.route.js diff --git a/awx/ui/client/src/inventories/sources/lookup/sources-lookup-inventory-script.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/lookup/sources-lookup-inventory-script.route.js similarity index 86% rename from awx/ui/client/src/inventories/sources/lookup/sources-lookup-inventory-script.route.js rename to awx/ui/client/src/inventories-hosts/inventories/related/sources/lookup/sources-lookup-inventory-script.route.js index 30863b76fa..c2a9ab71b9 100644 --- a/awx/ui/client/src/inventories/sources/lookup/sources-lookup-inventory-script.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/lookup/sources-lookup-inventory-script.route.js @@ -34,15 +34,15 @@ export default { ListDefinition: ['InventoryScriptsList', function(list) { return list; }], - OrganizationId: ['ListDefinition', 'InventoryManageService', '$stateParams', '$rootScope', - function(list, InventoryManageService, $stateParams, $rootScope){ + OrganizationId: ['ListDefinition', 'InventoriesService', '$stateParams', '$rootScope', + function(list, InventoriesService, $stateParams, $rootScope){ if($rootScope.$$childTail && $rootScope.$$childTail.$resolve && $rootScope.$$childTail.$resolve.hasOwnProperty('inventoryData')){ return $rootScope.$$childTail.$resolve.inventoryData.summary_fields.organization.id; } else { - return InventoryManageService.getInventory($stateParams.inventory_id).then(res => res.data.summary_fields.organization.id); + return InventoriesService.getInventory($stateParams.inventory_id).then(res => res.data.summary_fields.organization.id); } }], Dataset: ['ListDefinition', 'QuerySet', '$stateParams', 'GetBasePath', '$interpolate', '$rootScope', '$state', 'OrganizationId', diff --git a/awx/ui/client/src/inventories/sources/lookup/sources-lookup-project.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/lookup/sources-lookup-project.route.js similarity index 100% rename from awx/ui/client/src/inventories/sources/lookup/sources-lookup-project.route.js rename to awx/ui/client/src/inventories-hosts/inventories/related/sources/lookup/sources-lookup-project.route.js diff --git a/awx/ui/client/src/inventories/sources/main.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/main.js similarity index 100% rename from awx/ui/client/src/inventories/sources/main.js rename to awx/ui/client/src/inventories-hosts/inventories/related/sources/main.js diff --git a/awx/ui/client/src/inventories/sources/sources.form.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js similarity index 100% rename from awx/ui/client/src/inventories/sources/sources.form.js rename to awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js diff --git a/awx/ui/client/src/inventories/sources/sources.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.list.js similarity index 94% rename from awx/ui/client/src/inventories/sources/sources.list.js rename to awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.list.js index 5fc740f298..a857fa4c30 100644 --- a/awx/ui/client/src/inventories/sources/sources.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.list.js @@ -98,13 +98,6 @@ export default { dataPlacement: "top", iconClass: "fa fa-minus-circle" }, - copy: { - mode: 'all', - ngClick: "copyMoveSource(inventory_source.id)", - awToolTip: 'Copy or move source', - ngShow: "inventory_source.id > 0 && inventory_source.summary_fields.user_capabilities.copy", - dataPlacement: "top" - }, schedule: { mode: 'all', ngClick: "scheduleSource(inventory_source.id)", diff --git a/awx/ui/client/src/inventories/sources/sources.service.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.service.js similarity index 100% rename from awx/ui/client/src/inventories/sources/sources.service.js rename to awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.service.js diff --git a/awx/ui/client/src/inventories/smart-inventory/add/main.js b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/add/main.js similarity index 100% rename from awx/ui/client/src/inventories/smart-inventory/add/main.js rename to awx/ui/client/src/inventories-hosts/inventories/smart-inventory/add/main.js diff --git a/awx/ui/client/src/inventories/smart-inventory/add/smart-inventory-add.controller.js b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/add/smart-inventory-add.controller.js similarity index 100% rename from awx/ui/client/src/inventories/smart-inventory/add/smart-inventory-add.controller.js rename to awx/ui/client/src/inventories-hosts/inventories/smart-inventory/add/smart-inventory-add.controller.js diff --git a/awx/ui/client/src/inventories/smart-inventory/edit/main.js b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/edit/main.js similarity index 100% rename from awx/ui/client/src/inventories/smart-inventory/edit/main.js rename to awx/ui/client/src/inventories-hosts/inventories/smart-inventory/edit/main.js diff --git a/awx/ui/client/src/inventories/smart-inventory/edit/smart-inventory-edit.controller.js b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/edit/smart-inventory-edit.controller.js similarity index 100% rename from awx/ui/client/src/inventories/smart-inventory/edit/smart-inventory-edit.controller.js rename to awx/ui/client/src/inventories-hosts/inventories/smart-inventory/edit/smart-inventory-edit.controller.js diff --git a/awx/ui/client/src/inventories/smart-inventory/main.js b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/main.js similarity index 100% rename from awx/ui/client/src/inventories/smart-inventory/main.js rename to awx/ui/client/src/inventories-hosts/inventories/smart-inventory/main.js diff --git a/awx/ui/client/src/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.block.less b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.block.less similarity index 53% rename from awx/ui/client/src/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.block.less rename to awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.block.less index ff8683f2ca..aaa0d842d4 100644 --- a/awx/ui/client/src/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.block.less +++ b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.block.less @@ -1,4 +1,4 @@ -@import "../../../../shared/branding/colors.default.less"; +@import "../../../../../shared/branding/colors.default.less"; .HostFilterModal-tableRow:hover { background-color: @default-bg; diff --git a/awx/ui/client/src/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.directive.js b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.directive.js similarity index 95% rename from awx/ui/client/src/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.directive.js rename to awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.directive.js index 4dca001997..4556935bd1 100644 --- a/awx/ui/client/src/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.directive.js +++ b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.directive.js @@ -4,7 +4,7 @@ export default ['templateUrl', function(templateUrl) { scope: { hostFilter: '=' }, - templateUrl: templateUrl('inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal'), + templateUrl: templateUrl('inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal'), link: function(scope, element) { $('#host-filter-modal').on('hidden.bs.modal', function () { diff --git a/awx/ui/client/src/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.partial.html b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.partial.html similarity index 100% rename from awx/ui/client/src/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.partial.html rename to awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.partial.html diff --git a/awx/ui/client/src/inventories/smart-inventory/smart-inventory-host-filter/smart-inventory-host-filter.controller.js b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/smart-inventory-host-filter.controller.js similarity index 100% rename from awx/ui/client/src/inventories/smart-inventory/smart-inventory-host-filter/smart-inventory-host-filter.controller.js rename to awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/smart-inventory-host-filter.controller.js diff --git a/awx/ui/client/src/inventories/smart-inventory/smart-inventory-host-filter/smart-inventory-host-filter.directive.js b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/smart-inventory-host-filter.directive.js similarity index 84% rename from awx/ui/client/src/inventories/smart-inventory/smart-inventory-host-filter/smart-inventory-host-filter.directive.js rename to awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/smart-inventory-host-filter.directive.js index 1fe3abeb37..198a0eca7c 100644 --- a/awx/ui/client/src/inventories/smart-inventory/smart-inventory-host-filter/smart-inventory-host-filter.directive.js +++ b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/smart-inventory-host-filter.directive.js @@ -13,7 +13,7 @@ export default ['templateUrl', '$compile', hostFilter: '=' }, restrict: 'E', - templateUrl: templateUrl('inventories/smart-inventory/smart-inventory-host-filter/smart-inventory-host-filter'), + templateUrl: templateUrl('inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/smart-inventory-host-filter'), controller: smartInventoryHostFilterController, link: function(scope) { scope.openHostFilterModal = function() { diff --git a/awx/ui/client/src/inventories/smart-inventory/smart-inventory-host-filter/smart-inventory-host-filter.partial.html b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/smart-inventory-host-filter.partial.html similarity index 100% rename from awx/ui/client/src/inventories/smart-inventory/smart-inventory-host-filter/smart-inventory-host-filter.partial.html rename to awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/smart-inventory-host-filter.partial.html diff --git a/awx/ui/client/src/inventories/smart-inventory/smart-inventory-hosts.route.js b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-hosts.route.js similarity index 82% rename from awx/ui/client/src/inventories/smart-inventory/smart-inventory-hosts.route.js rename to awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-hosts.route.js index c6b0c01f28..753228efee 100644 --- a/awx/ui/client/src/inventories/smart-inventory/smart-inventory-hosts.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-hosts.route.js @@ -1,4 +1,4 @@ -import { N_ } from '../../i18n'; +import { N_ } from '../../../i18n'; export default { name: "inventories.editSmartInventory.hosts", @@ -49,15 +49,15 @@ export default { return qs.search(path, $stateParams[`${list.iterator}_search`]); } ], - hostsUrl: ['InventoryManageService', '$stateParams', function(InventoryManageService, $stateParams) { - return InventoryManageService.rootHostsUrl($stateParams.smartinventory_id); + hostsUrl: ['InventoriesService', '$stateParams', function(InventoriesService, $stateParams) { + return InventoriesService.rootHostsUrl($stateParams.smartinventory_id); }], hostsDataset: ['ListDefinition', 'QuerySet', '$stateParams', 'hostsUrl', (list, qs, $stateParams, hostsUrl) => { let path = hostsUrl; return qs.search(path, $stateParams[`${list.iterator}_search`]); }], - inventoryData: ['InventoryManageService', '$stateParams', function(InventoryManageService, $stateParams) { - return InventoryManageService.getInventory($stateParams.smartinventory_id).then(res => res.data); + inventoryData: ['InventoriesService', '$stateParams', function(InventoriesService, $stateParams) { + return InventoriesService.getInventory($stateParams.smartinventory_id).then(res => res.data); }] } }; diff --git a/awx/ui/client/src/inventories/smart-inventory/smart-inventory.form.js b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js similarity index 100% rename from awx/ui/client/src/inventories/smart-inventory/smart-inventory.form.js rename to awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js diff --git a/awx/ui/client/src/inventories/standard/add/inventory-add.controller.js b/awx/ui/client/src/inventories-hosts/inventories/standard-inventory/add/inventory-add.controller.js similarity index 100% rename from awx/ui/client/src/inventories/standard/add/inventory-add.controller.js rename to awx/ui/client/src/inventories-hosts/inventories/standard-inventory/add/inventory-add.controller.js diff --git a/awx/ui/client/src/inventories/standard/add/main.js b/awx/ui/client/src/inventories-hosts/inventories/standard-inventory/add/main.js similarity index 100% rename from awx/ui/client/src/inventories/standard/add/main.js rename to awx/ui/client/src/inventories-hosts/inventories/standard-inventory/add/main.js diff --git a/awx/ui/client/src/inventories/standard/edit/inventory-edit.controller.js b/awx/ui/client/src/inventories-hosts/inventories/standard-inventory/edit/inventory-edit.controller.js similarity index 100% rename from awx/ui/client/src/inventories/standard/edit/inventory-edit.controller.js rename to awx/ui/client/src/inventories-hosts/inventories/standard-inventory/edit/inventory-edit.controller.js diff --git a/awx/ui/client/src/inventories/standard/edit/main.js b/awx/ui/client/src/inventories-hosts/inventories/standard-inventory/edit/main.js similarity index 100% rename from awx/ui/client/src/inventories/standard/edit/main.js rename to awx/ui/client/src/inventories-hosts/inventories/standard-inventory/edit/main.js diff --git a/awx/ui/client/src/inventories/standard/inventory.form.js b/awx/ui/client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js similarity index 100% rename from awx/ui/client/src/inventories/standard/inventory.form.js rename to awx/ui/client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js diff --git a/awx/ui/client/src/inventories/standard/main.js b/awx/ui/client/src/inventories-hosts/inventories/standard-inventory/main.js similarity index 100% rename from awx/ui/client/src/inventories/standard/main.js rename to awx/ui/client/src/inventories-hosts/inventories/standard-inventory/main.js diff --git a/awx/ui/client/src/inventories-hosts/main.js b/awx/ui/client/src/inventories-hosts/main.js new file mode 100644 index 0000000000..be79ffa2e6 --- /dev/null +++ b/awx/ui/client/src/inventories-hosts/main.js @@ -0,0 +1,16 @@ +/************************************************* + * Copyright (c) 2017 Ansible, Inc. + * + * All Rights Reserved + *************************************************/ + + import hosts from './hosts/main'; + import inventories from './inventories/main'; + import shared from './shared/main'; + +export default +angular.module('inventories-hosts', [ + hosts.name, + inventories.name, + shared.name + ]); diff --git a/awx/ui/client/src/inventories/ansible_facts/ansible_facts.controller.js b/awx/ui/client/src/inventories-hosts/shared/ansible-facts/ansible-facts.controller.js similarity index 100% rename from awx/ui/client/src/inventories/ansible_facts/ansible_facts.controller.js rename to awx/ui/client/src/inventories-hosts/shared/ansible-facts/ansible-facts.controller.js diff --git a/awx/ui/client/src/inventories/ansible_facts/ansible_facts.partial.html b/awx/ui/client/src/inventories-hosts/shared/ansible-facts/ansible-facts.partial.html similarity index 100% rename from awx/ui/client/src/inventories/ansible_facts/ansible_facts.partial.html rename to awx/ui/client/src/inventories-hosts/shared/ansible-facts/ansible-facts.partial.html diff --git a/awx/ui/client/src/inventories/ansible_facts/ansible_facts.route.js b/awx/ui/client/src/inventories-hosts/shared/ansible-facts/ansible-facts.route.js similarity index 75% rename from awx/ui/client/src/inventories/ansible_facts/ansible_facts.route.js rename to awx/ui/client/src/inventories-hosts/shared/ansible-facts/ansible-facts.route.js index 9ce2a18672..cbac4735db 100644 --- a/awx/ui/client/src/inventories/ansible_facts/ansible_facts.route.js +++ b/awx/ui/client/src/inventories-hosts/shared/ansible-facts/ansible-facts.route.js @@ -1,5 +1,5 @@ -import {templateUrl} from '../../shared/template-url/template-url.factory'; -import { N_ } from '../../i18n'; +import {templateUrl} from '../../../shared/template-url/template-url.factory'; +import { N_ } from '../../../i18n'; export default { url: '/ansible_facts', @@ -9,7 +9,7 @@ export default { views: { 'related': { controller: 'AnsibleFactsController', - templateUrl: templateUrl('inventories/ansible_facts/ansible_facts') + templateUrl: templateUrl('inventories-hosts/shared/ansible-facts/ansible-facts') } }, resolve: { diff --git a/awx/ui/client/src/inventories/ansible_facts/main.js b/awx/ui/client/src/inventories-hosts/shared/ansible-facts/main.js similarity index 83% rename from awx/ui/client/src/inventories/ansible_facts/main.js rename to awx/ui/client/src/inventories-hosts/shared/ansible-facts/main.js index dffa3f9c69..506652953f 100644 --- a/awx/ui/client/src/inventories/ansible_facts/main.js +++ b/awx/ui/client/src/inventories-hosts/shared/ansible-facts/main.js @@ -4,7 +4,7 @@ * All Rights Reserved *************************************************/ -import controller from './ansible_facts.controller'; +import controller from './ansible-facts.controller'; export default angular.module('AnsibleFacts', []) diff --git a/awx/ui/client/src/inventories/host-groups/host-groups-associate/host-groups-associate.block.less b/awx/ui/client/src/inventories-hosts/shared/associate-groups/associate-groups.block.less similarity index 76% rename from awx/ui/client/src/inventories/host-groups/host-groups-associate/host-groups-associate.block.less rename to awx/ui/client/src/inventories-hosts/shared/associate-groups/associate-groups.block.less index b450855d67..9f764b92a2 100644 --- a/awx/ui/client/src/inventories/host-groups/host-groups-associate/host-groups-associate.block.less +++ b/awx/ui/client/src/inventories-hosts/shared/associate-groups/associate-groups.block.less @@ -1,9 +1,9 @@ @import "../../../shared/branding/colors.default.less"; -.HostGroupsAssociate-modalBody { +.AssociateGroups-modalBody { padding-top: 0px; } -.HostGroupsAssociate-backDrop { +.AssociateGroups-backDrop { width: 100vw; height: 100vh; position: fixed; diff --git a/awx/ui/client/src/inventories/host-groups/host-groups-associate/host-groups-associate.controller.js b/awx/ui/client/src/inventories-hosts/shared/associate-groups/associate-groups.controller.js similarity index 81% rename from awx/ui/client/src/inventories/host-groups/host-groups-associate/host-groups-associate.controller.js rename to awx/ui/client/src/inventories-hosts/shared/associate-groups/associate-groups.controller.js index 3f662b5145..41112ee0ec 100644 --- a/awx/ui/client/src/inventories/host-groups/host-groups-associate/host-groups-associate.controller.js +++ b/awx/ui/client/src/inventories-hosts/shared/associate-groups/associate-groups.controller.js @@ -5,9 +5,9 @@ *************************************************/ export default ['$scope', '$rootScope', 'ProcessErrors', 'GetBasePath', 'generateList', - '$state', 'Rest', '$q', 'Wait', '$window', 'QuerySet', 'GroupList', 'HostManageService', + '$state', 'Rest', '$q', 'Wait', '$window', 'QuerySet', 'GroupList', function($scope, $rootScope, ProcessErrors, GetBasePath, generateList, - $state, Rest, $q, Wait, $window, qs, GroupList, HostManageService) { + $state, Rest, $q, Wait, $window, qs, GroupList) { $scope.$on("linkLists", function() { init(); @@ -28,7 +28,7 @@ list.iterator = 'associate_group'; list.name = 'associate_groups'; list.multiSelect = true; - list.fields.name.ngClick = 'linkoutHostGroup(associate_group.id)'; + list.fields.name.ngClick = 'linkoutGroup(associate_group.id)'; list.trackBy = 'associate_group.id'; delete list.actions; delete list.fieldActions; @@ -80,19 +80,11 @@ }); } - $scope.linkHostGroup = function() { - // HostManageService.associateGroup(host, $scope.disassociateGroup.id).then(() => { - // $state.go($state.current, null, {reload: true}); - // $('#host-disassociate-modal').modal('hide'); - // $('body').removeClass('modal-open'); - // $('.modal-backdrop').remove(); - // }); - - $q.all( _.map($scope.selectedItems, (id) => HostManageService.associateGroup({id: $state.params.host_id}, id)) ) - .then( () =>{ - Wait('stop'); + $scope.linkGroups = function() { + $scope.saveFunction({selectedItems: $scope.selectedItems}) + .then(() =>{ $scope.closeModal(); - }, (error) => { + }).catch((error) => { $scope.closeModal(); ProcessErrors(null, error.data, error.status, null, { hdr: 'Error!', @@ -100,9 +92,10 @@ error.status }); }); + }; - $scope.linkoutHostGroup = function(userId) { + $scope.linkoutGroup = function(userId) { // Open the edit user form in a new tab so as not to navigate the user // away from the modal $window.open('/#/users/' + userId,'_blank'); diff --git a/awx/ui/client/src/inventories-hosts/shared/associate-groups/associate-groups.directive.js b/awx/ui/client/src/inventories-hosts/shared/associate-groups/associate-groups.directive.js new file mode 100644 index 0000000000..7b0595352c --- /dev/null +++ b/awx/ui/client/src/inventories-hosts/shared/associate-groups/associate-groups.directive.js @@ -0,0 +1,60 @@ +/************************************************* + * Copyright (c) 2016 Ansible, Inc. + * + * All Rights Reserved + *************************************************/ +import controller from './associate-groups.controller'; + +/* jshint unused: vars */ +export default ['templateUrl', 'Wait', '$compile', '$state', + function(templateUrl, Wait, $compile, $state) { + return { + restrict: 'E', + transclude: true, + scope: { + saveFunction: '&' + }, + controller: controller, + templateUrl: templateUrl('inventories-hosts/shared/associate-groups/associate-groups'), + link: function(scope, element, attrs, controller, transcludefn) { + + $("body").addClass("is-modalOpen"); + + //$("body").append(element); + + Wait('start'); + + scope.$broadcast("linkLists"); + + setTimeout(function() { + $('#associate-groups-modal').modal("show"); + }, 200); + + $('.modal[aria-hidden=false]').each(function () { + if ($(this).attr('id') !== 'associate-groups-modal') { + $(this).modal('hide'); + } + }); + + scope.closeModal = function() { + $("body").removeClass("is-modalOpen"); + $('#associate-groups-modal').on('hidden.bs.modal', + function () { + $('.AddUsers').remove(); + }); + $('#associate-groups-modal').modal('hide'); + + $state.go('^', null, {reload: true}); + }; + + scope.compileList = function(html) { + $('#associate-groups-list').append($compile(html)(scope)); + }; + + Wait('stop'); + + window.scrollTo(0,0); + } + }; + } +]; diff --git a/awx/ui/client/src/inventories/host-groups/host-groups-associate/host-groups-associate.partial.html b/awx/ui/client/src/inventories-hosts/shared/associate-groups/associate-groups.partial.html similarity index 64% rename from awx/ui/client/src/inventories/host-groups/host-groups-associate/host-groups-associate.partial.html rename to awx/ui/client/src/inventories-hosts/shared/associate-groups/associate-groups.partial.html index 8267b4fd21..02a493af8c 100644 --- a/awx/ui/client/src/inventories/host-groups/host-groups-associate/host-groups-associate.partial.html +++ b/awx/ui/client/src/inventories-hosts/shared/associate-groups/associate-groups.partial.html @@ -1,5 +1,5 @@ -