Merge pull request #13645 from TheRealHaoLiu/fix-websocket

Revert "Remove trailing $ from websocket_urlpatterns to work with cus…

.github/workflows/promote.yml

@@ -10,6 +10,7 @@ on:
 
 jobs:
   promote:
+    if: endsWith(github.repository, '/awx') 
     runs-on: ubuntu-latest
     steps:
       - name: Checkout awx

.github/workflows/stage.yml

@@ -21,6 +21,7 @@ on:
 
 jobs:
   stage:
+    if: endsWith(github.repository, '/awx')
     runs-on: ubuntu-latest
     permissions:
       packages: write

Makefile

@@ -1,4 +1,5 @@
 PYTHON ?= python3.9
+DOCKER_COMPOSE ?= docker-compose
 OFFICIAL ?= no
 NODE ?= node
 NPM_BIN ?= npm
@@ -203,19 +204,7 @@ uwsgi: collectstatic
 	@if [ "$(VENV_BASE)" ]; then \
 		. $(VENV_BASE)/awx/bin/activate; \
 	fi; \
-	uwsgi -b 32768 \
+	uwsgi /etc/tower/uwsgi.ini
-	    --socket 127.0.0.1:8050 \
-	    --module=awx.wsgi:application \
-	    --home=/var/lib/awx/venv/awx \
-	    --chdir=/awx_devel/ \
-	    --vacuum \
-	    --processes=5 \
-	    --harakiri=120 --master \
-	    --no-orphans \
-	    --max-requests=1000 \
-	    --stats /tmp/stats.socket \
-	    --lazy-apps \
-	    --logformat "%(addr) %(method) %(uri) - %(proto) %(status)"
 
 awx-autoreload:
 	@/awx_devel/tools/docker-compose/awx-autoreload /awx_devel/awx "$(DEV_RELOAD_COMMAND)"
@@ -509,20 +498,20 @@ docker-compose-sources: .git/hooks/pre-commit
 
 
 docker-compose: awx/projects docker-compose-sources
-	docker-compose -f tools/docker-compose/_sources/docker-compose.yml $(COMPOSE_OPTS) up $(COMPOSE_UP_OPTS) --remove-orphans
+	$(DOCKER_COMPOSE) -f tools/docker-compose/_sources/docker-compose.yml $(COMPOSE_OPTS) up $(COMPOSE_UP_OPTS) --remove-orphans
 
 docker-compose-credential-plugins: awx/projects docker-compose-sources
 	echo -e "\033[0;31mTo generate a CyberArk Conjur API key: docker exec -it tools_conjur_1 conjurctl account create quick-start\033[0m"
-	docker-compose -f tools/docker-compose/_sources/docker-compose.yml -f tools/docker-credential-plugins-override.yml up --no-recreate awx_1 --remove-orphans
+	$(DOCKER_COMPOSE) -f tools/docker-compose/_sources/docker-compose.yml -f tools/docker-credential-plugins-override.yml up --no-recreate awx_1 --remove-orphans
 
 docker-compose-test: awx/projects docker-compose-sources
-	docker-compose -f tools/docker-compose/_sources/docker-compose.yml run --rm --service-ports awx_1 /bin/bash
+	$(DOCKER_COMPOSE) -f tools/docker-compose/_sources/docker-compose.yml run --rm --service-ports awx_1 /bin/bash
 
 docker-compose-runtest: awx/projects docker-compose-sources
-	docker-compose -f tools/docker-compose/_sources/docker-compose.yml run --rm --service-ports awx_1 /start_tests.sh
+	$(DOCKER_COMPOSE) -f tools/docker-compose/_sources/docker-compose.yml run --rm --service-ports awx_1 /start_tests.sh
 
 docker-compose-build-swagger: awx/projects docker-compose-sources
-	docker-compose -f tools/docker-compose/_sources/docker-compose.yml run --rm --service-ports --no-deps awx_1 /start_tests.sh swagger
+	$(DOCKER_COMPOSE) -f tools/docker-compose/_sources/docker-compose.yml run --rm --service-ports --no-deps awx_1 /start_tests.sh swagger
 
 SCHEMA_DIFF_BASE_BRANCH ?= devel
 detect-schema-change: genschema
@@ -531,7 +520,7 @@ detect-schema-change: genschema
 	diff -u -b reference-schema.json schema.json
 
 docker-compose-clean: awx/projects
-	docker-compose -f tools/docker-compose/_sources/docker-compose.yml rm -sf
+	$(DOCKER_COMPOSE) -f tools/docker-compose/_sources/docker-compose.yml rm -sf
 
 docker-compose-container-group-clean:
 	@if [ -f "tools/docker-compose-minikube/_sources/minikube" ]; then \
@@ -559,10 +548,10 @@ docker-refresh: docker-clean docker-compose
 
 ## Docker Development Environment with Elastic Stack Connected
 docker-compose-elk: awx/projects docker-compose-sources
-	docker-compose -f tools/docker-compose/_sources/docker-compose.yml -f tools/elastic/docker-compose.logstash-link.yml -f tools/elastic/docker-compose.elastic-override.yml up --no-recreate
+	$(DOCKER_COMPOSE) -f tools/docker-compose/_sources/docker-compose.yml -f tools/elastic/docker-compose.logstash-link.yml -f tools/elastic/docker-compose.elastic-override.yml up --no-recreate
 
 docker-compose-cluster-elk: awx/projects docker-compose-sources
-	docker-compose -f tools/docker-compose/_sources/docker-compose.yml -f tools/elastic/docker-compose.logstash-link-cluster.yml -f tools/elastic/docker-compose.elastic-override.yml up --no-recreate
+	$(DOCKER_COMPOSE) -f tools/docker-compose/_sources/docker-compose.yml -f tools/elastic/docker-compose.logstash-link-cluster.yml -f tools/elastic/docker-compose.elastic-override.yml up --no-recreate
 
 docker-compose-container-group:
 	MINIKUBE_CONTAINER_GROUP=true make docker-compose

awx/api/conf.py

@@ -1,5 +1,4 @@
 # Django
-from django.conf import settings
 from django.utils.translation import gettext_lazy as _
 
 # Django REST Framework
@@ -9,6 +8,7 @@ from rest_framework import serializers
 from awx.conf import fields, register, register_validate
 from awx.api.fields import OAuth2ProviderField
 from oauth2_provider.settings import oauth2_settings
+from awx.sso.common import is_remote_auth_enabled
 
 
 register(
@@ -108,19 +108,8 @@ register(
 
 
 def authentication_validate(serializer, attrs):
-    remote_auth_settings = [
+    if attrs.get('DISABLE_LOCAL_AUTH', False) and not is_remote_auth_enabled():
-        'AUTH_LDAP_SERVER_URI',
+        raise serializers.ValidationError(_("There are no remote authentication systems configured."))
-        'SOCIAL_AUTH_GOOGLE_OAUTH2_KEY',
-        'SOCIAL_AUTH_GITHUB_KEY',
-        'SOCIAL_AUTH_GITHUB_ORG_KEY',
-        'SOCIAL_AUTH_GITHUB_TEAM_KEY',
-        'SOCIAL_AUTH_SAML_ENABLED_IDPS',
-        'RADIUS_SERVER',
-        'TACACSPLUS_HOST',
-    ]
-    if attrs.get('DISABLE_LOCAL_AUTH', False):
-        if not any(getattr(settings, s, None) for s in remote_auth_settings):
-            raise serializers.ValidationError(_("There are no remote authentication systems configured."))
     return attrs
 
 

awx/api/filters.py

@@ -155,7 +155,7 @@ class FieldLookupBackend(BaseFilterBackend):
         'search',
     )
 
-    # A list of fields that we know can be filtered on without the possiblity
+    # A list of fields that we know can be filtered on without the possibility
     # of introducing duplicates
     NO_DUPLICATES_ALLOW_LIST = (CharField, IntegerField, BooleanField, TextField)
 
@@ -268,7 +268,7 @@ class FieldLookupBackend(BaseFilterBackend):
                     continue
 
                 # HACK: make `created` available via API for the Django User ORM model
-                # so it keep compatiblity with other objects which exposes the `created` attr.
+                # so it keep compatibility with other objects which exposes the `created` attr.
                 if queryset.model._meta.object_name == 'User' and key.startswith('created'):
                     key = key.replace('created', 'date_joined')
 

awx/api/generics.py

@@ -28,7 +28,7 @@ from rest_framework import generics
 from rest_framework.response import Response
 from rest_framework import status
 from rest_framework import views
-from rest_framework.permissions import AllowAny
+from rest_framework.permissions import IsAuthenticated
 from rest_framework.renderers import StaticHTMLRenderer
 from rest_framework.negotiation import DefaultContentNegotiation
 
@@ -674,7 +674,7 @@ class SubListCreateAttachDetachAPIView(SubListCreateAPIView):
                 location = None
             created = True
 
-        # Retrive the sub object (whether created or by ID).
+        # Retrieve the sub object (whether created or by ID).
         sub = get_object_or_400(self.model, pk=sub_id)
 
         # Verify we have permission to attach.
@@ -822,7 +822,7 @@ def trigger_delayed_deep_copy(*args, **kwargs):
 
 class CopyAPIView(GenericAPIView):
     serializer_class = CopySerializer
-    permission_classes = (AllowAny,)
+    permission_classes = (IsAuthenticated,)
     copy_return_serializer_class = None
     new_in_330 = True
     new_in_api_v2 = True

awx/api/renderers.py

@@ -60,7 +60,7 @@ class BrowsableAPIRenderer(renderers.BrowsableAPIRenderer):
             delattr(renderer_context['view'], '_request')
 
     def get_raw_data_form(self, data, view, method, request):
-        # Set a flag on the view to indiciate to the view/serializer that we're
+        # Set a flag on the view to indicate to the view/serializer that we're
         # creating a raw data form for the browsable API.  Store the original
         # request method to determine how to populate the raw data form.
         if request.method in {'OPTIONS', 'DELETE'}:

awx/api/serializers.py

@@ -108,7 +108,6 @@ from awx.main.utils import (
     extract_ansible_vars,
     encrypt_dict,
     prefetch_page_capabilities,
-    get_external_account,
     truncate_stdout,
 )
 from awx.main.utils.filters import SmartFilter
@@ -124,6 +123,8 @@ from awx.api.fields import BooleanNullField, CharNullField, ChoiceNullField, Ver
 # AWX Utils
 from awx.api.validators import HostnameRegexValidator
 
+from awx.sso.common import get_external_account
+
 logger = logging.getLogger('awx.api.serializers')
 
 # Fields that should be summarized regardless of object type.
@@ -536,7 +537,7 @@ class BaseSerializer(serializers.ModelSerializer, metaclass=BaseSerializerMetacl
         #
         # This logic is to force rendering choice's on an uneditable field.
         # Note: Consider expanding this rendering for more than just choices fields
-        # Note: This logic works in conjuction with
+        # Note: This logic works in conjunction with
         if hasattr(model_field, 'choices') and model_field.choices:
             was_editable = model_field.editable
             model_field.editable = True
@@ -987,23 +988,8 @@ class UserSerializer(BaseSerializer):
     def _update_password(self, obj, new_password):
         # For now we're not raising an error, just not saving password for
         # users managed by LDAP who already have an unusable password set.
-        if getattr(settings, 'AUTH_LDAP_SERVER_URI', None):
+        # Get external password will return something like ldap or enterprise or None if the user isn't external. We only want to allow a password update for a None option
-            try:
+        if new_password and not self.get_external_account(obj):
-                if obj.pk and obj.profile.ldap_dn and not obj.has_usable_password():
-                    new_password = None
-            except AttributeError:
-                pass
-        if (
-            getattr(settings, 'SOCIAL_AUTH_GOOGLE_OAUTH2_KEY', None)
-            or getattr(settings, 'SOCIAL_AUTH_GITHUB_KEY', None)
-            or getattr(settings, 'SOCIAL_AUTH_GITHUB_ORG_KEY', None)
-            or getattr(settings, 'SOCIAL_AUTH_GITHUB_TEAM_KEY', None)
-            or getattr(settings, 'SOCIAL_AUTH_SAML_ENABLED_IDPS', None)
-        ) and obj.social_auth.all():
-            new_password = None
-        if (getattr(settings, 'RADIUS_SERVER', None) or getattr(settings, 'TACACSPLUS_HOST', None)) and obj.enterprise_auth.all():
-            new_password = None
-        if new_password:
             obj.set_password(new_password)
             obj.save(update_fields=['password'])
 
@@ -1680,8 +1666,13 @@ class InventorySerializer(LabelsListMixin, BaseSerializerWithVariables):
         res.update(
             dict(
                 hosts=self.reverse('api:inventory_hosts_list', kwargs={'pk': obj.pk}),
+                groups=self.reverse('api:inventory_groups_list', kwargs={'pk': obj.pk}),
+                root_groups=self.reverse('api:inventory_root_groups_list', kwargs={'pk': obj.pk}),
                 variable_data=self.reverse('api:inventory_variable_data', kwargs={'pk': obj.pk}),
                 script=self.reverse('api:inventory_script_view', kwargs={'pk': obj.pk}),
+                tree=self.reverse('api:inventory_tree_view', kwargs={'pk': obj.pk}),
+                inventory_sources=self.reverse('api:inventory_inventory_sources_list', kwargs={'pk': obj.pk}),
+                update_inventory_sources=self.reverse('api:inventory_inventory_sources_update', kwargs={'pk': obj.pk}),
                 activity_stream=self.reverse('api:inventory_activity_stream_list', kwargs={'pk': obj.pk}),
                 job_templates=self.reverse('api:inventory_job_template_list', kwargs={'pk': obj.pk}),
                 ad_hoc_commands=self.reverse('api:inventory_ad_hoc_commands_list', kwargs={'pk': obj.pk}),
@@ -1692,18 +1683,8 @@ class InventorySerializer(LabelsListMixin, BaseSerializerWithVariables):
                 labels=self.reverse('api:inventory_label_list', kwargs={'pk': obj.pk}),
             )
         )
-        if obj.kind in ('', 'constructed'):
-            # links not relevant for the "old" smart inventory
-            res['groups'] = self.reverse('api:inventory_groups_list', kwargs={'pk': obj.pk})
-            res['root_groups'] = self.reverse('api:inventory_root_groups_list', kwargs={'pk': obj.pk})
-            res['update_inventory_sources'] = self.reverse('api:inventory_inventory_sources_update', kwargs={'pk': obj.pk})
-            res['inventory_sources'] = self.reverse('api:inventory_inventory_sources_list', kwargs={'pk': obj.pk})
-            res['tree'] = self.reverse('api:inventory_tree_view', kwargs={'pk': obj.pk})
         if obj.organization:
             res['organization'] = self.reverse('api:organization_detail', kwargs={'pk': obj.organization.pk})
-        if obj.kind == 'constructed':
-            res['input_inventories'] = self.reverse('api:inventory_input_inventories', kwargs={'pk': obj.pk})
-            res['constructed_url'] = self.reverse('api:constructed_inventory_detail', kwargs={'pk': obj.pk})
         return res
 
     def to_representation(self, obj):
@@ -1745,91 +1726,6 @@ class InventorySerializer(LabelsListMixin, BaseSerializerWithVariables):
         return super(InventorySerializer, self).validate(attrs)
 
 
-class ConstructedFieldMixin(serializers.Field):
-    def get_attribute(self, instance):
-        if not hasattr(instance, '_constructed_inv_src'):
-            instance._constructed_inv_src = instance.inventory_sources.first()
-        inv_src = instance._constructed_inv_src
-        return super().get_attribute(inv_src)  # yoink
-
-
-class ConstructedCharField(ConstructedFieldMixin, serializers.CharField):
-    pass
-
-
-class ConstructedIntegerField(ConstructedFieldMixin, serializers.IntegerField):
-    pass
-
-
-class ConstructedInventorySerializer(InventorySerializer):
-    source_vars = ConstructedCharField(
-        required=False,
-        default=None,
-        allow_blank=True,
-        help_text=_('The source_vars for the related auto-created inventory source, special to constructed inventory.'),
-    )
-    update_cache_timeout = ConstructedIntegerField(
-        required=False,
-        allow_null=True,
-        min_value=0,
-        default=None,
-        help_text=_('The cache timeout for the related auto-created inventory source, special to constructed inventory'),
-    )
-    limit = ConstructedCharField(
-        required=False,
-        default=None,
-        allow_blank=True,
-        help_text=_('The limit to restrict the returned hosts for the related auto-created inventory source, special to constructed inventory.'),
-    )
-    verbosity = ConstructedIntegerField(
-        required=False,
-        allow_null=True,
-        min_value=0,
-        max_value=2,
-        default=None,
-        help_text=_('The verbosity level for the related auto-created inventory source, special to constructed inventory'),
-    )
-
-    class Meta:
-        model = Inventory
-        fields = ('*', '-host_filter', 'source_vars', 'update_cache_timeout', 'limit', 'verbosity')
-        read_only_fields = ('*', 'kind')
-
-    def pop_inv_src_data(self, data):
-        inv_src_data = {}
-        for field in ('source_vars', 'update_cache_timeout', 'limit', 'verbosity'):
-            if field in data:
-                # values always need to be removed, as they are not valid for Inventory model
-                value = data.pop(field)
-                # null is not valid for any of those fields, taken as not-provided
-                if value is not None:
-                    inv_src_data[field] = value
-        return inv_src_data
-
-    def apply_inv_src_data(self, inventory, inv_src_data):
-        if inv_src_data:
-            update_fields = []
-            inv_src = inventory.inventory_sources.first()
-            for field, value in inv_src_data.items():
-                setattr(inv_src, field, value)
-                update_fields.append(field)
-            if update_fields:
-                inv_src.save(update_fields=update_fields)
-
-    def create(self, validated_data):
-        validated_data['kind'] = 'constructed'
-        inv_src_data = self.pop_inv_src_data(validated_data)
-        inventory = super().create(validated_data)
-        self.apply_inv_src_data(inventory, inv_src_data)
-        return inventory
-
-    def update(self, obj, validated_data):
-        inv_src_data = self.pop_inv_src_data(validated_data)
-        obj = super().update(obj, validated_data)
-        self.apply_inv_src_data(obj, inv_src_data)
-        return obj
-
-
 class InventoryScriptSerializer(InventorySerializer):
     class Meta:
         fields = ()
@@ -1883,8 +1779,6 @@ class HostSerializer(BaseSerializerWithVariables):
                 ansible_facts=self.reverse('api:host_ansible_facts_detail', kwargs={'pk': obj.pk}),
             )
         )
-        if obj.inventory.kind == 'constructed':
-            res['original_host'] = self.reverse('api:host_detail', kwargs={'pk': obj.instance_id})
         if obj.inventory:
             res['inventory'] = self.reverse('api:inventory_detail', kwargs={'pk': obj.inventory.pk})
         if obj.last_job:
@@ -1941,8 +1835,8 @@ class HostSerializer(BaseSerializerWithVariables):
         return value
 
     def validate_inventory(self, value):
-        if value.kind in ('constructed', 'smart'):
+        if value.kind == 'smart':
-            raise serializers.ValidationError({"detail": _("Cannot create Host for Smart or Constructed Inventories")})
+            raise serializers.ValidationError({"detail": _("Cannot create Host for Smart Inventory")})
         return value
 
     def validate_variables(self, value):
@@ -2040,8 +1934,8 @@ class GroupSerializer(BaseSerializerWithVariables):
         return value
 
     def validate_inventory(self, value):
-        if value.kind in ('constructed', 'smart'):
+        if value.kind == 'smart':
-            raise serializers.ValidationError({"detail": _("Cannot create Group for Smart or Constructed Inventories")})
+            raise serializers.ValidationError({"detail": _("Cannot create Group for Smart Inventory")})
         return value
 
     def to_representation(self, obj):
@@ -2115,7 +2009,6 @@ class InventorySourceOptionsSerializer(BaseSerializer):
             'custom_virtualenv',
             'timeout',
             'verbosity',
-            'limit',
         )
         read_only_fields = ('*', 'custom_virtualenv')
 
@@ -2222,8 +2115,8 @@ class InventorySourceSerializer(UnifiedJobTemplateSerializer, InventorySourceOpt
         return value
 
     def validate_inventory(self, value):
-        if value and value.kind in ('constructed', 'smart'):
+        if value and value.kind == 'smart':
-            raise serializers.ValidationError({"detail": _("Cannot create Inventory Source for Smart or Constructed Inventories")})
+            raise serializers.ValidationError({"detail": _("Cannot create Inventory Source for Smart Inventory")})
         return value
 
     # TODO: remove when old 'credential' fields are removed
@@ -2244,8 +2137,6 @@ class InventorySourceSerializer(UnifiedJobTemplateSerializer, InventorySourceOpt
         obj = super(InventorySourceSerializer, self).update(obj, validated_data)
         if deprecated_fields:
             self._update_deprecated_fields(deprecated_fields, obj)
-        if obj.source == 'constructed':
-            raise serializers.ValidationError({'error': _("Cannot edit source of type constructed.")})
         return obj
 
     # TODO: remove when old 'credential' fields are removed
@@ -2272,8 +2163,6 @@ class InventorySourceSerializer(UnifiedJobTemplateSerializer, InventorySourceOpt
         if get_field_from_model_or_attrs('source') == 'scm':
             if ('source' in attrs or 'source_project' in attrs) and get_field_from_model_or_attrs('source_project') is None:
                 raise serializers.ValidationError({"source_project": _("Project required for scm type sources.")})
-        elif (get_field_from_model_or_attrs('source') == 'constructed') and (self.instance and self.instance.source != 'constructed'):
-            raise serializers.ValidationError({"Error": _('constructed not a valid source for inventory')})
         else:
             redundant_scm_fields = list(filter(lambda x: attrs.get(x, None), ['source_project', 'source_path']))
             if redundant_scm_fields:
@@ -4094,7 +3983,7 @@ class JobEventSerializer(BaseSerializer):
         # Show full stdout for playbook_on_* events.
         if obj and obj.event.startswith('playbook_on'):
             return data
-        # If the view logic says to not trunctate (request was to the detail view or a param was used)
+        # If the view logic says to not truncate (request was to the detail view or a param was used)
         if self.context.get('no_truncate', False):
             return data
         max_bytes = settings.EVENT_STDOUT_MAX_BYTES_DISPLAY
@@ -4125,7 +4014,7 @@ class ProjectUpdateEventSerializer(JobEventSerializer):
         # raw SCM URLs in their stdout (which *could* contain passwords)
         # attempt to detect and filter HTTP basic auth passwords in the stdout
         # of these types of events
-        if obj.event_data.get('task_action') in ('git', 'svn'):
+        if obj.event_data.get('task_action') in ('git', 'svn', 'ansible.builtin.git', 'ansible.builtin.svn'):
             try:
                 return json.loads(UriCleaner.remove_sensitive(json.dumps(obj.event_data)))
             except Exception:
@@ -4169,7 +4058,7 @@ class AdHocCommandEventSerializer(BaseSerializer):
 
     def to_representation(self, obj):
         data = super(AdHocCommandEventSerializer, self).to_representation(obj)
-        # If the view logic says to not trunctate (request was to the detail view or a param was used)
+        # If the view logic says to not truncate (request was to the detail view or a param was used)
         if self.context.get('no_truncate', False):
             return data
         max_bytes = settings.EVENT_STDOUT_MAX_BYTES_DISPLAY
@@ -4862,7 +4751,7 @@ class ScheduleSerializer(LaunchConfigurationBaseSerializer, SchedulePreviewSeria
         ),
     )
     until = serializers.SerializerMethodField(
-        help_text=_('The date this schedule will end. This field is computed from the RRULE. If the schedule does not end an emptry string will be returned'),
+        help_text=_('The date this schedule will end. This field is computed from the RRULE. If the schedule does not end an empty string will be returned'),
     )
 
     class Meta:

awx/api/templates/api/dashboard_inventory_graph_view.md

@@ -3,7 +3,7 @@ Make a GET request to this resource to retrieve aggregate statistics about inven
 Including fetching the number of total hosts tracked by Tower over an amount of time and the current success or
 failed status of hosts which have run jobs within an Inventory.
 
-## Parmeters and Filtering
+## Parameters and Filtering
 
 The `period` of the data can be adjusted with:
 
@@ -24,7 +24,7 @@ Data about the number of hosts will be returned in the following format:
 Each element contains an epoch timestamp represented in seconds and a numerical value indicating
 the number of hosts that exist at a given moment
 
-Data about failed and successfull hosts by inventory will be given as:
+Data about failed and successful hosts by inventory will be given as:
 
     {
             "sources": [

awx/api/templates/api/dashboard_jobs_graph_view.md

@@ -2,7 +2,7 @@
 
 Make a GET request to this resource to retrieve aggregate statistics about job runs suitable for graphing.
 
-## Parmeters and Filtering
+## Parameters and Filtering
 
 The `period` of the data can be adjusted with:
 

awx/api/templates/api/inventory_inventory_sources_update.md

@@ -18,7 +18,7 @@ inventory sources:
 * `inventory_update`: ID of the inventory update job that was started.
   (integer, read-only)
 * `project_update`: ID of the project update job that was started if this inventory source is an SCM source.
-  (interger, read-only, optional)
+  (integer, read-only, optional)
 
 Note: All manual inventory sources (source="") will be ignored by the update_inventory_sources endpoint.  This endpoint will not update inventory sources for Smart Inventories.  
 

awx/api/urls/inventory.py

@@ -6,10 +6,7 @@ from django.urls import re_path
 from awx.api.views.inventory import (
     InventoryList,
     InventoryDetail,
-    ConstructedInventoryDetail,
-    ConstructedInventoryList,
     InventoryActivityStreamList,
-    InventoryInputInventoriesList,
     InventoryJobTemplateList,
     InventoryAccessList,
     InventoryObjectRolesList,
@@ -40,7 +37,6 @@ urls = [
     re_path(r'^(?P<pk>[0-9]+)/script/$', InventoryScriptView.as_view(), name='inventory_script_view'),
     re_path(r'^(?P<pk>[0-9]+)/tree/$', InventoryTreeView.as_view(), name='inventory_tree_view'),
     re_path(r'^(?P<pk>[0-9]+)/inventory_sources/$', InventoryInventorySourcesList.as_view(), name='inventory_inventory_sources_list'),
-    re_path(r'^(?P<pk>[0-9]+)/input_inventories/$', InventoryInputInventoriesList.as_view(), name='inventory_input_inventories'),
     re_path(r'^(?P<pk>[0-9]+)/update_inventory_sources/$', InventoryInventorySourcesUpdate.as_view(), name='inventory_inventory_sources_update'),
     re_path(r'^(?P<pk>[0-9]+)/activity_stream/$', InventoryActivityStreamList.as_view(), name='inventory_activity_stream_list'),
     re_path(r'^(?P<pk>[0-9]+)/job_templates/$', InventoryJobTemplateList.as_view(), name='inventory_job_template_list'),
@@ -52,10 +48,4 @@ urls = [
     re_path(r'^(?P<pk>[0-9]+)/copy/$', InventoryCopy.as_view(), name='inventory_copy'),
 ]
 
-# Constructed inventory special views
+__all__ = ['urls']
-constructed_inventory_urls = [
-    re_path(r'^$', ConstructedInventoryList.as_view(), name='constructed_inventory_list'),
-    re_path(r'^(?P<pk>[0-9]+)/$', ConstructedInventoryDetail.as_view(), name='constructed_inventory_detail'),
-]
-
-__all__ = ['urls', 'constructed_inventory_urls']

awx/api/urls/urls.py

@@ -39,7 +39,7 @@ from .organization import urls as organization_urls
 from .user import urls as user_urls
 from .project import urls as project_urls
 from .project_update import urls as project_update_urls
-from .inventory import urls as inventory_urls, constructed_inventory_urls
+from .inventory import urls as inventory_urls
 from .execution_environments import urls as execution_environment_urls
 from .team import urls as team_urls
 from .host import urls as host_urls
@@ -110,7 +110,6 @@ v2_urls = [
     re_path(r'^project_updates/', include(project_update_urls)),
     re_path(r'^teams/', include(team_urls)),
     re_path(r'^inventories/', include(inventory_urls)),
-    re_path(r'^constructed_inventories/', include(constructed_inventory_urls)),
     re_path(r'^hosts/', include(host_urls)),
     re_path(r'^groups/', include(group_urls)),
     re_path(r'^inventory_sources/', include(inventory_source_urls)),

awx/api/views/__init__.py

@@ -152,7 +152,7 @@ def api_exception_handler(exc, context):
         if 'awx.named_url_rewritten' in req.environ and not str(getattr(exc, 'status_code', 0)).startswith('2'):
             # if the URL was rewritten, and it's not a 2xx level status code,
             # revert the request.path to its original value to avoid leaking
-            # any context about the existance of resources
+            # any context about the existence of resources
             req.path = req.environ['awx.named_url_rewritten']
             if exc.status_code == 403:
                 exc = NotFound(detail=_('Not found.'))
@@ -172,7 +172,7 @@ class DashboardView(APIView):
         user_inventory = get_user_queryset(request.user, models.Inventory)
         inventory_with_failed_hosts = user_inventory.filter(hosts_with_active_failures__gt=0)
         user_inventory_external = user_inventory.filter(has_inventory_sources=True)
-        # if there are *zero* inventories, this aggregrate query will be None, fall back to 0
+        # if there are *zero* inventories, this aggregate query will be None, fall back to 0
         failed_inventory = user_inventory.aggregate(Sum('inventory_sources_with_failures'))['inventory_sources_with_failures__sum'] or 0
         data['inventories'] = {
             'url': reverse('api:inventory_list', request=request),
@@ -1559,8 +1559,6 @@ class HostDetail(RelatedJobsPreventDeleteMixin, RetrieveUpdateDestroyAPIView):
     def delete(self, request, *args, **kwargs):
         if self.get_object().inventory.pending_deletion:
             return Response({"error": _("The inventory for this host is already being deleted.")}, status=status.HTTP_400_BAD_REQUEST)
-        if self.get_object().inventory.kind == 'constructed':
-            return Response({"error": _("Delete constructed inventory hosts from input inventory.")}, status=status.HTTP_400_BAD_REQUEST)
         return super(HostDetail, self).delete(request, *args, **kwargs)
 
 
@@ -1669,7 +1667,7 @@ class GroupList(ListCreateAPIView):
 
 class EnforceParentRelationshipMixin(object):
     """
-    Useful when you have a self-refering ManyToManyRelationship.
+    Useful when you have a self-referring ManyToManyRelationship.
     * Tower uses a shallow (2-deep only) url pattern. For example:
 
     When an object hangs off of a parent object you would have the url of the
@@ -2417,7 +2415,7 @@ class JobTemplateSurveySpec(GenericAPIView):
                             status=status.HTTP_400_BAD_REQUEST,
                         )
             # if it's a multiselect or multiple choice, it must have coices listed
-            # choices and defualts must come in as strings seperated by /n characters.
+            # choices and defaults must come in as strings separated by /n characters.
             if qtype == 'multiselect' or qtype == 'multiplechoice':
                 if 'choices' in survey_item:
                     if isinstance(survey_item['choices'], str):
@@ -3432,7 +3430,7 @@ class JobCreateSchedule(RetrieveAPIView):
 
         config = obj.launch_config
 
-        # Make up a name for the schedule, guarentee that it is unique
+        # Make up a name for the schedule, guarantee that it is unique
         name = 'Auto-generated schedule from job {}'.format(obj.id)
         existing_names = models.Schedule.objects.filter(name__startswith=name).values_list('name', flat=True)
         if name in existing_names:
@@ -3623,7 +3621,7 @@ class JobJobEventsChildrenSummary(APIView):
         # key is counter of meta events (i.e. verbose), value is uuid of the assigned parent
         map_meta_counter_nested_uuid = {}
 
-        # collapsable tree view in the UI only makes sense for tree-like
+        # collapsible tree view in the UI only makes sense for tree-like
         # hierarchy. If ansible is ran with a strategy like free or host_pinned, then
         # events can be out of sequential order, and no longer follow a tree structure
         # E1
@@ -4290,7 +4288,7 @@ class WorkflowApprovalTemplateJobsList(SubListAPIView):
     parent_key = 'workflow_approval_template'
 
 
-class WorkflowApprovalList(ListCreateAPIView):
+class WorkflowApprovalList(ListAPIView):
     model = models.WorkflowApproval
     serializer_class = serializers.WorkflowApprovalListSerializer
 

awx/api/views/inventory.py

@@ -14,7 +14,6 @@ from django.utils.translation import gettext_lazy as _
 from rest_framework.exceptions import PermissionDenied
 from rest_framework.response import Response
 from rest_framework import status
-from rest_framework import serializers
 
 # AWX
 from awx.main.models import ActivityStream, Inventory, JobTemplate, Role, User, InstanceGroup, InventoryUpdateEvent, InventoryUpdate
@@ -32,7 +31,6 @@ from awx.api.views.labels import LabelSubListCreateAttachDetachView
 
 from awx.api.serializers import (
     InventorySerializer,
-    ConstructedInventorySerializer,
     ActivityStreamSerializer,
     RoleSerializer,
     InstanceGroupSerializer,
@@ -81,9 +79,7 @@ class InventoryDetail(RelatedJobsPreventDeleteMixin, RetrieveUpdateDestroyAPIVie
 
         # Do not allow changes to an Inventory kind.
         if kind is not None and obj.kind != kind:
-            return Response(
+            return Response(dict(error=_('You cannot turn a regular inventory into a "smart" inventory.')), status=status.HTTP_405_METHOD_NOT_ALLOWED)
-                dict(error=_('You cannot turn a regular inventory into a "smart" or "constructed" inventory.')), status=status.HTTP_405_METHOD_NOT_ALLOWED
-            )
         return super(InventoryDetail, self).update(request, *args, **kwargs)
 
     def destroy(self, request, *args, **kwargs):
@@ -98,29 +94,6 @@ class InventoryDetail(RelatedJobsPreventDeleteMixin, RetrieveUpdateDestroyAPIVie
             return Response(dict(error=_("{0}".format(e))), status=status.HTTP_400_BAD_REQUEST)
 
 
-class ConstructedInventoryDetail(InventoryDetail):
-    serializer_class = ConstructedInventorySerializer
-
-
-class ConstructedInventoryList(InventoryList):
-    serializer_class = ConstructedInventorySerializer
-
-    def get_queryset(self):
-        r = super().get_queryset()
-        return r.filter(kind='constructed')
-
-
-class InventoryInputInventoriesList(SubListAttachDetachAPIView):
-    model = Inventory
-    serializer_class = InventorySerializer
-    parent_model = Inventory
-    relationship = 'input_inventories'
-
-    def is_valid_relation(self, parent, sub, created=False):
-        if sub.kind == 'constructed':
-            raise serializers.ValidationError({'error': 'You cannot add a constructed inventory to another constructed inventory.'})
-
-
 class InventoryActivityStreamList(SubListAPIView):
     model = ActivityStream
     serializer_class = ActivityStreamSerializer

awx/api/views/root.py

@@ -98,7 +98,6 @@ class ApiVersionRootView(APIView):
         data['tokens'] = reverse('api:o_auth2_token_list', request=request)
         data['metrics'] = reverse('api:metrics_view', request=request)
         data['inventory'] = reverse('api:inventory_list', request=request)
-        data['constructed_inventory'] = reverse('api:constructed_inventory_list', request=request)
         data['inventory_sources'] = reverse('api:inventory_source_list', request=request)
         data['inventory_updates'] = reverse('api:inventory_update_list', request=request)
         data['groups'] = reverse('api:group_list', request=request)

awx/conf/fields.py

@@ -21,7 +21,7 @@ logger = logging.getLogger('awx.conf.fields')
 # Use DRF fields to convert/validate settings:
 # - to_representation(obj) should convert a native Python object to a primitive
 #   serializable type. This primitive type will be what is presented in the API
-#   and stored in the JSON field in the datbase.
+#   and stored in the JSON field in the database.
 # - to_internal_value(data) should convert the primitive type back into the
 #   appropriate Python type to be used in settings.
 

awx/conf/migrations/_ldap_group_type.py

@@ -1,7 +1,11 @@
 import inspect
 
 from django.conf import settings
-from django.utils.timezone import now
+
+import logging
+
+
+logger = logging.getLogger('awx.conf.migrations')
 
 
 def fill_ldap_group_type_params(apps, schema_editor):
@@ -15,7 +19,7 @@ def fill_ldap_group_type_params(apps, schema_editor):
         entry = qs[0]
         group_type_params = entry.value
     else:
-        entry = Setting(key='AUTH_LDAP_GROUP_TYPE_PARAMS', value=group_type_params, created=now(), modified=now())
+        return  # for new installs we prefer to use the default value
 
     init_attrs = set(inspect.getfullargspec(group_type.__init__).args[1:])
     for k in list(group_type_params.keys()):
@@ -23,4 +27,5 @@ def fill_ldap_group_type_params(apps, schema_editor):
             del group_type_params[k]
 
     entry.value = group_type_params
+    logger.warning(f'Migration updating AUTH_LDAP_GROUP_TYPE_PARAMS with value {entry.value}')
     entry.save()

awx/conf/tests/functional/test_migrations.py

@@ -0,0 +1,25 @@
+import pytest
+
+from awx.conf.migrations._ldap_group_type import fill_ldap_group_type_params
+from awx.conf.models import Setting
+
+from django.apps import apps
+
+
+@pytest.mark.django_db
+def test_fill_group_type_params_no_op():
+    fill_ldap_group_type_params(apps, 'dont-use-me')
+    assert Setting.objects.count() == 0
+
+
+@pytest.mark.django_db
+def test_keep_old_setting_with_default_value():
+    Setting.objects.create(key='AUTH_LDAP_GROUP_TYPE', value={'name_attr': 'cn', 'member_attr': 'member'})
+    fill_ldap_group_type_params(apps, 'dont-use-me')
+    assert Setting.objects.count() == 1
+    s = Setting.objects.first()
+    assert s.value == {'name_attr': 'cn', 'member_attr': 'member'}
+
+
+# NOTE: would be good to test the removal of attributes by migration
+# but this requires fighting with the validator and is not done here

awx/conf/views.py

@@ -180,7 +180,7 @@ class SettingLoggingTest(GenericAPIView):
             if not port:
                 return Response({'error': 'Port required for ' + protocol}, status=status.HTTP_400_BAD_REQUEST)
         else:
-            # if http/https by this point, domain is reacheable
+            # if http/https by this point, domain is reachable
             return Response(status=status.HTTP_202_ACCEPTED)
 
         if protocol == 'udp':

awx/locale/en-us/LC_MESSAGES/django.po

@@ -1972,7 +1972,7 @@ msgid ""
 "HTTP headers and meta keys to search to determine remote host name or IP. "
 "Add additional items to this list, such as \"HTTP_X_FORWARDED_FOR\", if "
 "behind a reverse proxy. See the \"Proxy Support\" section of the "
-"Adminstrator guide for more details."
+"Administrator guide for more details."
 msgstr ""
 
 #: awx/main/conf.py:85
@@ -2457,7 +2457,7 @@ msgid ""
 msgstr ""
 
 #: awx/main/conf.py:631
-msgid "Maximum disk persistance for external log aggregation (in GB)"
+msgid "Maximum disk persistence for external log aggregation (in GB)"
 msgstr ""
 
 #: awx/main/conf.py:633
@@ -2548,7 +2548,7 @@ msgid "Enable"
 msgstr ""
 
 #: awx/main/constants.py:27
-msgid "Doas"
+msgid "Does"
 msgstr ""
 
 #: awx/main/constants.py:28
@@ -4801,7 +4801,7 @@ msgstr ""
 
 #: awx/main/models/workflow.py:251
 msgid ""
-"An identifier coresponding to the workflow job template node that this node "
+"An identifier corresponding to the workflow job template node that this node "
 "was created from."
 msgstr ""
 
@@ -5521,7 +5521,7 @@ msgstr ""
 #: awx/sso/conf.py:606
 msgid ""
 "Extra arguments for Google OAuth2 login. You can restrict it to only allow a "
-"single domain to authenticate, even if the user is logged in with multple "
+"single domain to authenticate, even if the user is logged in with multiple "
 "Google accounts. Refer to the documentation for more detail."
 msgstr ""
 
@@ -5905,7 +5905,7 @@ msgstr ""
 
 #: awx/sso/conf.py:1290
 msgid ""
-"Create a keypair to use as a service provider (SP) and include the "
+"Create a key pair to use as a service provider (SP) and include the "
 "certificate content here."
 msgstr ""
 
@@ -5915,7 +5915,7 @@ msgstr ""
 
 #: awx/sso/conf.py:1302
 msgid ""
-"Create a keypair to use as a service provider (SP) and include the private "
+"Create a key pair to use as a service provider (SP) and include the private "
 "key content here."
 msgstr ""
 

awx/locale/es/LC_MESSAGES/django.po

@@ -1971,7 +1971,7 @@ msgid ""
 "HTTP headers and meta keys to search to determine remote host name or IP. "
 "Add additional items to this list, such as \"HTTP_X_FORWARDED_FOR\", if "
 "behind a reverse proxy. See the \"Proxy Support\" section of the "
-"Adminstrator guide for more details."
+"Administrator guide for more details."
 msgstr "Los encabezados HTTP y las llaves de activación para buscar y determinar el nombre de host remoto o IP. Añada elementos adicionales a esta lista, como \"HTTP_X_FORWARDED_FOR\", si está detrás de un proxy inverso. Consulte la sección \"Soporte de proxy\" de la guía del adminstrador para obtener más información."
 
 #: awx/main/conf.py:85
@@ -4804,7 +4804,7 @@ msgstr "Indica que un trabajo no se creará cuando es sea True. La semántica de
 
 #: awx/main/models/workflow.py:251
 msgid ""
-"An identifier coresponding to the workflow job template node that this node "
+"An identifier corresponding to the workflow job template node that this node "
 "was created from."
 msgstr "Un identificador que corresponde al nodo de plantilla de tarea del flujo de trabajo a partir del cual se creó este nodo."
 
@@ -5526,7 +5526,7 @@ msgstr "Argumentos adicionales para Google OAuth2"
 #: awx/sso/conf.py:606
 msgid ""
 "Extra arguments for Google OAuth2 login. You can restrict it to only allow a "
-"single domain to authenticate, even if the user is logged in with multple "
+"single domain to authenticate, even if the user is logged in with multiple "
 "Google accounts. Refer to the documentation for more detail."
 msgstr "Argumentos adicionales para el inicio de sesión en Google OAuth2. Puede limitarlo para permitir la autenticación de un solo dominio, incluso si el usuario ha iniciado sesión con varias cuentas de Google. Consulte la documentación para obtener información detallada."
 
@@ -5910,7 +5910,7 @@ msgstr "Certificado público del proveedor de servicio SAML"
 
 #: awx/sso/conf.py:1290
 msgid ""
-"Create a keypair to use as a service provider (SP) and include the "
+"Create a key pair to use as a service provider (SP) and include the "
 "certificate content here."
 msgstr "Crear un par de claves para usar como proveedor de servicio (SP) e incluir el contenido del certificado aquí."
 
@@ -5920,7 +5920,7 @@ msgstr "Clave privada del proveedor de servicio SAML"
 
 #: awx/sso/conf.py:1302
 msgid ""
-"Create a keypair to use as a service provider (SP) and include the private "
+"Create a key pair to use as a service provider (SP) and include the private "
 "key content here."
 msgstr "Crear un par de claves para usar como proveedor de servicio (SP) e incluir el contenido de la clave privada aquí."
 

awx/main/credential_plugins/aim.py

@@ -70,7 +70,7 @@ def aim_backend(**kwargs):
     client_cert = kwargs.get('client_cert', None)
     client_key = kwargs.get('client_key', None)
     verify = kwargs['verify']
-    webservice_id = kwargs['webservice_id']
+    webservice_id = kwargs.get('webservice_id', '')
     app_id = kwargs['app_id']
     object_query = kwargs['object_query']
     object_query_format = kwargs['object_query_format']

awx/main/management/commands/disable_instance.py

@@ -0,0 +1,143 @@
+import time
+from urllib.parse import urljoin
+
+from argparse import ArgumentTypeError
+
+from django.conf import settings
+from django.core.management.base import BaseCommand, CommandError
+from django.db.models import Q
+from django.utils.timezone import now
+
+from awx.main.models import Instance, UnifiedJob
+
+
+class AWXInstance:
+    def __init__(self, **filter):
+        self.filter = filter
+        self.get_instance()
+
+    def get_instance(self):
+        filter = self.filter if self.filter is not None else dict(hostname=settings.CLUSTER_HOST_ID)
+        qs = Instance.objects.filter(**filter)
+        if not qs.exists():
+            raise ValueError(f"No AWX instance found with {filter} parameters")
+        self.instance = qs.first()
+
+    def disable(self):
+        if self.instance.enabled:
+            self.instance.enabled = False
+            self.instance.save()
+            return True
+
+    def enable(self):
+        if not self.instance.enabled:
+            self.instance.enabled = True
+            self.instance.save()
+            return True
+
+    def jobs(self):
+        return UnifiedJob.objects.filter(
+            Q(controller_node=self.instance.hostname) | Q(execution_node=self.instance.hostname), status__in=("running", "waiting")
+        )
+
+    def jobs_pretty(self):
+        jobs = []
+        for j in self.jobs():
+            job_started = j.started if j.started else now()
+            # similar calculation of `elapsed` as the corresponding serializer
+            # does
+            td = now() - job_started
+            elapsed = (td.microseconds + (td.seconds + td.days * 24 * 3600) * 10**6) / (10**6 * 1.0)
+            elapsed = float(elapsed)
+            details = dict(
+                name=j.name,
+                url=j.get_ui_url(),
+                elapsed=elapsed,
+            )
+            jobs.append(details)
+
+        jobs = sorted(jobs, reverse=True, key=lambda j: j["elapsed"])
+
+        return ", ".join([f"[\"{j['name']}\"]({j['url']})" for j in jobs])
+
+    def instance_pretty(self):
+        instance = (
+            self.instance.hostname,
+            urljoin(settings.TOWER_URL_BASE, f"/#/instances/{self.instance.pk}/details"),
+        )
+        return f"[\"{instance[0]}\"]({instance[1]})"
+
+
+class Command(BaseCommand):
+    help = "Disable instance, optionally waiting for all its managed jobs to finish."
+
+    @staticmethod
+    def ge_1(arg):
+        if arg == "inf":
+            return float("inf")
+
+        int_arg = int(arg)
+        if int_arg < 1:
+            raise ArgumentTypeError(f"The value must be a positive number >= 1. Provided: \"{arg}\"")
+        return int_arg
+
+    def add_arguments(self, parser):
+        filter_group = parser.add_mutually_exclusive_group()
+
+        filter_group.add_argument(
+            "--hostname",
+            type=str,
+            default=settings.CLUSTER_HOST_ID,
+            help=f"{Instance.hostname.field.help_text} Defaults to the hostname of the machine where the Python interpreter is currently executing".strip(),
+        )
+        filter_group.add_argument("--id", type=self.ge_1, help=Instance.id.field.help_text)
+
+        parser.add_argument(
+            "--wait",
+            action="store_true",
+            help="Wait for jobs managed by the instance to finish. With default retry arguments waits ~1h",
+        )
+
+        parser.add_argument(
+            "--retry",
+            type=self.ge_1,
+            default=120,
+            help="Number of retries when waiting for jobs to finish. Default: 120. Also accepts \"inf\" to wait indefinitely",
+        )
+
+        parser.add_argument(
+            "--retry_sleep",
+            type=self.ge_1,
+            default=30,
+            help="Number of seconds to sleep before consequtive retries when waiting. Default: 30",
+        )
+
+    def handle(self, *args, **options):
+        try:
+            filter = dict(id=options["id"]) if options["id"] is not None else dict(hostname=options["hostname"])
+            instance = AWXInstance(**filter)
+        except ValueError as e:
+            raise CommandError(e)
+
+        if instance.disable():
+            self.stdout.write(self.style.SUCCESS(f"Instance {instance.instance_pretty()} has been disabled"))
+        else:
+            self.stdout.write(f"Instance {instance.instance_pretty()} has already been disabled")
+
+        if not options["wait"]:
+            return
+
+        rc = 1
+        while instance.jobs().count() > 0:
+            if rc < options["retry"]:
+                self.stdout.write(
+                    f"{rc}/{options['retry']}: Waiting {options['retry_sleep']}s before the next attempt to see if the following instance' managed jobs have finished: {instance.jobs_pretty()}"
+                )
+                rc += 1
+                time.sleep(options["retry_sleep"])
+            else:
+                raise CommandError(
+                    f"{rc}/{options['retry']}: No more retry attempts left, but the instance still has associated managed jobs: {instance.jobs_pretty()}"
+                )
+        else:
+            self.stdout.write(self.style.SUCCESS("Done waiting for instance' managed jobs to finish!"))

awx/main/migrations/0175_constructed_inventory.py

@@ -1,109 +0,0 @@
-# Generated by Django 3.2.16 on 2022-12-07 14:20
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('main', '0174_ensure_org_ee_admin_roles'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='inventory',
-            name='input_inventories',
-            field=models.ManyToManyField(
-                blank=True,
-                help_text='Only valid for constructed inventories, this links to the inventories that will be used.',
-                related_name='destination_inventories',
-                to='main.Inventory',
-            ),
-        ),
-        migrations.AlterField(
-            model_name='inventory',
-            name='kind',
-            field=models.CharField(
-                blank=True,
-                choices=[
-                    ('', 'Hosts have a direct link to this inventory.'),
-                    ('smart', 'Hosts for inventory generated using the host_filter property.'),
-                    ('constructed', 'Parse list of source inventories with the constructed inventory plugin.'),
-                ],
-                default='',
-                help_text='Kind of inventory being represented.',
-                max_length=32,
-            ),
-        ),
-        migrations.AlterField(
-            model_name='inventorysource',
-            name='source',
-            field=models.CharField(
-                choices=[
-                    ('file', 'File, Directory or Script'),
-                    ('constructed', 'Template additional groups and hostvars at runtime'),
-                    ('scm', 'Sourced from a Project'),
-                    ('ec2', 'Amazon EC2'),
-                    ('gce', 'Google Compute Engine'),
-                    ('azure_rm', 'Microsoft Azure Resource Manager'),
-                    ('vmware', 'VMware vCenter'),
-                    ('satellite6', 'Red Hat Satellite 6'),
-                    ('openstack', 'OpenStack'),
-                    ('rhv', 'Red Hat Virtualization'),
-                    ('controller', 'Red Hat Ansible Automation Platform'),
-                    ('insights', 'Red Hat Insights'),
-                ],
-                default=None,
-                max_length=32,
-            ),
-        ),
-        migrations.AlterField(
-            model_name='inventoryupdate',
-            name='source',
-            field=models.CharField(
-                choices=[
-                    ('file', 'File, Directory or Script'),
-                    ('constructed', 'Template additional groups and hostvars at runtime'),
-                    ('scm', 'Sourced from a Project'),
-                    ('ec2', 'Amazon EC2'),
-                    ('gce', 'Google Compute Engine'),
-                    ('azure_rm', 'Microsoft Azure Resource Manager'),
-                    ('vmware', 'VMware vCenter'),
-                    ('satellite6', 'Red Hat Satellite 6'),
-                    ('openstack', 'OpenStack'),
-                    ('rhv', 'Red Hat Virtualization'),
-                    ('controller', 'Red Hat Ansible Automation Platform'),
-                    ('insights', 'Red Hat Insights'),
-                ],
-                default=None,
-                max_length=32,
-            ),
-        ),
-        migrations.AddField(
-            model_name='inventorysource',
-            name='limit',
-            field=models.TextField(blank=True, default='', help_text='Enter host, group or pattern match'),
-        ),
-        migrations.AddField(
-            model_name='inventoryupdate',
-            name='limit',
-            field=models.TextField(blank=True, default='', help_text='Enter host, group or pattern match'),
-        ),
-        migrations.AlterField(
-            model_name='inventorysource',
-            name='host_filter',
-            field=models.TextField(
-                blank=True,
-                default='',
-                help_text='This field is deprecated and will be removed in a future release. Regex where only matching hosts will be imported.',
-            ),
-        ),
-        migrations.AlterField(
-            model_name='inventoryupdate',
-            name='host_filter',
-            field=models.TextField(
-                blank=True,
-                default='',
-                help_text='This field is deprecated and will be removed in a future release. Regex where only matching hosts will be imported.',
-            ),
-        ),
-    ]

awx/main/models/inventory.py

@@ -49,7 +49,7 @@ from awx.main.models.notifications import (
 from awx.main.models.credential.injectors import _openstack_data
 from awx.main.utils import _inventory_updates
 from awx.main.utils.safe_yaml import sanitize_jinja
-from awx.main.utils.execution_environments import to_container_path, get_control_plane_execution_environment
+from awx.main.utils.execution_environments import to_container_path
 from awx.main.utils.licensing import server_product_name
 
 
@@ -67,7 +67,6 @@ class Inventory(CommonModelNameNotUnique, ResourceMixin, RelatedJobsMixin):
     KIND_CHOICES = [
         ('', _('Hosts have a direct link to this inventory.')),
         ('smart', _('Hosts for inventory generated using the host_filter property.')),
-        ('constructed', _('Parse list of source inventories with the constructed inventory plugin.')),
     ]
 
     class Meta:
@@ -140,12 +139,6 @@ class Inventory(CommonModelNameNotUnique, ResourceMixin, RelatedJobsMixin):
         default=None,
         help_text=_('Filter that will be applied to the hosts of this inventory.'),
     )
-    input_inventories = models.ManyToManyField(
-        'Inventory',
-        blank=True,
-        related_name='destination_inventories',
-        help_text=_('Only valid for constructed inventories, this links to the inventories that will be used.'),
-    )
     instance_groups = OrderedManyToManyField(
         'InstanceGroup',
         blank=True,
@@ -438,22 +431,12 @@ class Inventory(CommonModelNameNotUnique, ResourceMixin, RelatedJobsMixin):
 
             connection.on_commit(on_commit)
 
-    def _enforce_constructed_source(self):
-        """
-        Constructed inventory should always have exactly 1 inventory source, constructed type
-        this enforces that requirement
-        """
-        if self.kind == 'constructed':
-            if not self.inventory_sources.exists():
-                self.inventory_sources.create(source='constructed', name=f'Auto-created source for: {self.name}'[:512], overwrite=True, update_on_launch=True)
-
     def save(self, *args, **kwargs):
         self._update_host_smart_inventory_memeberships()
         super(Inventory, self).save(*args, **kwargs)
         if self.kind == 'smart' and 'host_filter' in kwargs.get('update_fields', ['host_filter']) and connection.vendor != 'sqlite':
             # Minimal update of host_count for smart inventory host filter changes
             self.update_computed_fields()
-        self._enforce_constructed_source()
 
     def delete(self, *args, **kwargs):
         self._update_host_smart_inventory_memeberships()
@@ -851,7 +834,6 @@ class InventorySourceOptions(BaseModel):
 
     SOURCE_CHOICES = [
         ('file', _('File, Directory or Script')),
-        ('constructed', _('Template additional groups and hostvars at runtime')),
         ('scm', _('Sourced from a Project')),
         ('ec2', _('Amazon EC2')),
         ('gce', _('Google Compute Engine')),
@@ -925,7 +907,7 @@ class InventorySourceOptions(BaseModel):
     host_filter = models.TextField(
         blank=True,
         default='',
-        help_text=_('This field is deprecated and will be removed in a future release. Regex where only matching hosts will be imported.'),
+        help_text=_('Regex where only matching hosts will be imported.'),
     )
     overwrite = models.BooleanField(
         default=False,
@@ -945,21 +927,6 @@ class InventorySourceOptions(BaseModel):
         blank=True,
         default=1,
     )
-    limit = models.TextField(
-        blank=True,
-        default='',
-        help_text=_("Enter host, group or pattern match"),
-    )
-
-    def resolve_execution_environment(self):
-        """
-        Project updates, themselves, will use the control plane execution environment.
-        Jobs using the project can use the default_environment, but the project updates
-        are not flexible enough to allow customizing the image they use.
-        """
-        if self.inventory.kind == 'constructed':
-            return get_control_plane_execution_environment()
-        return super().resolve_execution_environment()
 
     @staticmethod
     def cloud_credential_validation(source, cred):
@@ -1396,8 +1363,6 @@ class PluginFileInjector(object):
         env.update(injector_env)
         # Preserves current behavior for Ansible change in default planned for 2.10
         env['ANSIBLE_TRANSFORM_INVALID_GROUP_CHARS'] = 'never'
-        # All CLOUD_PROVIDERS sources implement as inventory plugin from collection
-        env['ANSIBLE_INVENTORY_ENABLED'] = 'auto'
         return env
 
     def _get_shared_env(self, inventory_update, private_data_dir, private_data_files):
@@ -1581,17 +1546,5 @@ class insights(PluginFileInjector):
     use_fqcn = True
 
 
-class constructed(PluginFileInjector):
-    plugin_name = 'constructed'
-    namespace = 'ansible'
-    collection = 'builtin'
-
-    def build_env(self, *args, **kwargs):
-        env = super().build_env(*args, **kwargs)
-        # Enable all types of inventory plugins so we pick up the script files from source inventories
-        del env['ANSIBLE_INVENTORY_ENABLED']
-        return env
-
-
 for cls in PluginFileInjector.__subclasses__():
     InventorySourceOptions.injectors[cls.__name__] = cls

awx/main/models/oauth.py

@@ -14,7 +14,7 @@ from oauth2_provider.models import AbstractApplication, AbstractAccessToken
 from oauth2_provider.generators import generate_client_secret
 from oauthlib import oauth2
 
-from awx.main.utils import get_external_account
+from awx.sso.common import get_external_account
 from awx.main.fields import OAuth2ClientSecretField
 
 

awx/main/tasks/callback.py

@@ -116,7 +116,7 @@ class RunnerCallback:
             # so it *should* have a negligible performance impact
             task = event_data.get('event_data', {}).get('task_action')
             try:
-                if task in ('git', 'svn'):
+                if task in ('git', 'svn', 'ansible.builtin.git', 'ansible.builtin.svn'):
                     event_data_json = json.dumps(event_data)
                     event_data_json = UriCleaner.remove_sensitive(event_data_json)
                     event_data = json.loads(event_data_json)
@@ -219,7 +219,7 @@ class RunnerCallbackForProjectUpdate(RunnerCallback):
     def event_handler(self, event_data):
         super_return_value = super(RunnerCallbackForProjectUpdate, self).event_handler(event_data)
         returned_data = event_data.get('event_data', {})
-        if returned_data.get('task_action', '') == 'set_fact':
+        if returned_data.get('task_action', '') in ('set_fact', 'ansible.builtin.set_fact'):
             returned_facts = returned_data.get('res', {}).get('ansible_facts', {})
             if 'scm_version' in returned_facts:
                 self.playbook_new_revision = returned_facts['scm_version']

awx/main/tasks/jobs.py

@@ -311,26 +311,21 @@ class BaseTask(object):
         env['AWX_PRIVATE_DATA_DIR'] = private_data_dir
 
         if self.instance.execution_environment is None:
-            raise RuntimeError('The project could not sync because there is no Execution Environment.')
+            raise RuntimeError(f'The {self.model.__name__} could not run because there is no Execution Environment.')
 
         return env
 
-    def write_inventory_file(self, inventory, private_data_dir, file_name, script_params):
-        script_data = inventory.get_script_data(**script_params)
-        for hostname, hv in script_data.get('_meta', {}).get('hostvars', {}).items():
-            # maintain a list of host_name --> host_id
-            # so we can associate emitted events to Host objects
-            self.runner_callback.host_map[hostname] = hv.get('remote_tower_id', '')
-        file_content = '#! /usr/bin/env python3\n# -*- coding: utf-8 -*-\nprint(%r)\n' % json.dumps(script_data)
-        return self.write_private_data_file(private_data_dir, file_name, file_content, sub_dir='inventory', file_permissions=0o700)
-
     def build_inventory(self, instance, private_data_dir):
         script_params = dict(hostvars=True, towervars=True)
         if hasattr(instance, 'job_slice_number'):
             script_params['slice_number'] = instance.job_slice_number
             script_params['slice_count'] = instance.job_slice_count
-
+        script_data = instance.inventory.get_script_data(**script_params)
-        return self.write_inventory_file(instance.inventory, private_data_dir, 'hosts', script_params)
+        # maintain a list of host_name --> host_id
+        # so we can associate emitted events to Host objects
+        self.runner_callback.host_map = {hostname: hv.pop('remote_tower_id', '') for hostname, hv in script_data.get('_meta', {}).get('hostvars', {}).items()}
+        file_content = '#! /usr/bin/env python3\n# -*- coding: utf-8 -*-\nprint(%r)\n' % json.dumps(script_data)
+        return self.write_private_data_file(private_data_dir, 'hosts', file_content, sub_dir='inventory', file_permissions=0o700)
 
     def build_args(self, instance, private_data_dir, passwords):
         raise NotImplementedError
@@ -1469,6 +1464,8 @@ class RunInventoryUpdate(SourceControlMixin, BaseTask):
 
         if injector is not None:
             env = injector.build_env(inventory_update, env, private_data_dir, private_data_files)
+            # All CLOUD_PROVIDERS sources implement as inventory plugin from collection
+            env['ANSIBLE_INVENTORY_ENABLED'] = 'auto'
 
         if inventory_update.source == 'scm':
             for env_k in inventory_update.source_vars_dict:
@@ -1521,15 +1518,6 @@ class RunInventoryUpdate(SourceControlMixin, BaseTask):
 
         args = ['ansible-inventory', '--list', '--export']
 
-        # special case for constructed inventories, we pass source inventories from database
-        # these must come in order, and in order _before_ the constructed inventory itself
-        if inventory_update.inventory.kind == 'constructed':
-            for input_inventory in inventory_update.inventory.input_inventories.all():
-                args.append('-i')
-                script_params = dict(hostvars=True, towervars=True)
-                source_inv_path = self.write_inventory_file(input_inventory, private_data_dir, f'hosts_{input_inventory.id}', script_params)
-                args.append(to_container_path(source_inv_path, private_data_dir))
-
         # Add arguments for the source inventory file/script/thing
         rel_path = self.pseudo_build_inventory(inventory_update, private_data_dir)
         container_location = os.path.join(CONTAINER_ROOT, rel_path)
@@ -1537,11 +1525,6 @@ class RunInventoryUpdate(SourceControlMixin, BaseTask):
 
         args.append('-i')
         args.append(container_location)
-        # Added this in order to allow older versions of ansible-inventory https://github.com/ansible/ansible/pull/79596
-        # limit should be usable in ansible-inventory 2.15+
-        if inventory_update.limit:
-            args.append('--limit')
-            args.append(inventory_update.limit)
 
         args.append('--output')
         args.append(os.path.join(CONTAINER_ROOT, 'artifacts', str(inventory_update.id), 'output.json'))

awx/main/tests/functional/api/test_inventory.py

@@ -594,45 +594,3 @@ class TestControlledBySCM:
             rando,
             expect=403,
         )
-
-
-@pytest.mark.django_db
-class TestConstructedInventory:
-    @pytest.fixture
-    def constructed_inventory(self, organization):
-        return Inventory.objects.create(name='constructed-test-inventory', kind='constructed', organization=organization)
-
-    def test_get_constructed_inventory(self, constructed_inventory, admin_user, get):
-        inv_src = constructed_inventory.inventory_sources.first()
-        inv_src.update_cache_timeout = 53
-        inv_src.save(update_fields=['update_cache_timeout'])
-        r = get(url=reverse('api:constructed_inventory_detail', kwargs={'pk': constructed_inventory.pk}), user=admin_user, expect=200)
-        assert r.data['update_cache_timeout'] == 53
-
-    def test_patch_constructed_inventory(self, constructed_inventory, admin_user, patch):
-        inv_src = constructed_inventory.inventory_sources.first()
-        assert inv_src.update_cache_timeout == 0
-        assert inv_src.limit == ''
-        r = patch(
-            url=reverse('api:constructed_inventory_detail', kwargs={'pk': constructed_inventory.pk}),
-            data=dict(update_cache_timeout=54, limit='foobar'),
-            user=admin_user,
-            expect=200,
-        )
-        assert r.data['update_cache_timeout'] == 54
-        inv_src = constructed_inventory.inventory_sources.first()
-        assert inv_src.update_cache_timeout == 54
-        assert inv_src.limit == 'foobar'
-
-    def test_create_constructed_inventory(self, constructed_inventory, admin_user, post, organization):
-        r = post(
-            url=reverse('api:constructed_inventory_list'),
-            data=dict(name='constructed-inventory-just-created', kind='constructed', organization=organization.id, update_cache_timeout=55, limit='foobar'),
-            user=admin_user,
-            expect=201,
-        )
-        pk = r.data['id']
-        constructed_inventory = Inventory.objects.get(pk=pk)
-        inv_src = constructed_inventory.inventory_sources.first()
-        assert inv_src.update_cache_timeout == 55
-        assert inv_src.limit == 'foobar'

awx/main/tests/functional/conftest.py

@@ -511,14 +511,6 @@ def group(inventory):
     return inventory.groups.create(name='single-group')
 
 
-@pytest.fixture
-def constructed_inventory(organization):
-    """
-    creates a new constructed inventory source
-    """
-    return Inventory.objects.create(name='dummy1', kind='constructed', organization=organization)
-
-
 @pytest.fixture
 def inventory_source(inventory):
     # by making it ec2, the credential is not required

awx/main/tests/functional/models/test_inventory.py

@@ -169,8 +169,7 @@ class TestInventorySourceInjectors:
         CLOUD_PROVIDERS constant contains the same names as what are
         defined within the injectors
         """
-        # slight exception case for constructed, because it has a FQCN but is not a cloud source
+        assert set(CLOUD_PROVIDERS) == set(InventorySource.injectors.keys())
-        assert set(CLOUD_PROVIDERS) | set(['constructed']) == set(InventorySource.injectors.keys())
 
     @pytest.mark.parametrize('source,filename', [('ec2', 'aws_ec2.yml'), ('openstack', 'openstack.yml'), ('gce', 'gcp_compute.yml')])
     def test_plugin_filenames(self, source, filename):

awx/main/tests/functional/test_inventory_input_constructed.py

@@ -1,61 +0,0 @@
-import pytest
-from awx.main.models import Inventory
-from awx.api.versioning import reverse
-
-
-@pytest.mark.django_db
-def test_constructed_inventory_post(post, admin_user, organization):
-    inv1 = Inventory.objects.create(name='dummy1', kind='constructed', organization=organization)
-    inv2 = Inventory.objects.create(name='dummy2', kind='constructed', organization=organization)
-    resp = post(
-        url=reverse('api:inventory_input_inventories', kwargs={'pk': inv1.pk}),
-        data={'id': inv2.pk},
-        user=admin_user,
-        expect=400,
-    )
-    assert resp.status_code == 400
-
-
-@pytest.mark.django_db
-def test_add_constructed_inventory_source(post, admin_user, constructed_inventory):
-    resp = post(
-        url=reverse('api:inventory_inventory_sources_list', kwargs={'pk': constructed_inventory.pk}),
-        data={'name': 'dummy1', 'source': 'constructed'},
-        user=admin_user,
-        expect=400,
-    )
-    assert resp.status_code == 400
-
-
-@pytest.mark.django_db
-def test_add_constructed_inventory_host(post, admin_user, constructed_inventory):
-    resp = post(
-        url=reverse('api:inventory_hosts_list', kwargs={'pk': constructed_inventory.pk}),
-        data={'name': 'dummy1'},
-        user=admin_user,
-        expect=400,
-    )
-    assert resp.status_code == 400
-
-
-@pytest.mark.django_db
-def test_add_constructed_inventory_group(post, admin_user, constructed_inventory):
-    resp = post(
-        reverse('api:inventory_groups_list', kwargs={'pk': constructed_inventory.pk}),
-        data={'name': 'group-test'},
-        user=admin_user,
-        expect=400,
-    )
-    assert resp.status_code == 400
-
-
-@pytest.mark.django_db
-def test_edit_constructed_inventory_source(patch, admin_user, inventory_source_factory):
-    inv_src = inventory_source_factory(name='dummy1', source='constructed')
-    resp = patch(
-        reverse('api:inventory_source_detail', kwargs={'pk': inv_src.pk}),
-        data={'description': inv_src.name},
-        user=admin_user,
-        expect=400,
-    )
-    assert resp.status_code == 400

awx/main/tests/unit/test_tasks.py

@@ -2008,7 +2008,7 @@ def test_project_update_no_ee(mock_me):
     with pytest.raises(RuntimeError) as e:
         task.build_env(job, {})
 
-    assert 'The project could not sync because there is no Execution Environment' in str(e.value)
+    assert 'The ProjectUpdate could not run because there is no Execution Environment' in str(e.value)
 
 
 @pytest.mark.parametrize(

awx/main/utils/common.py

@@ -80,7 +80,6 @@ __all__ = [
     'set_environ',
     'IllegalArgumentError',
     'get_custom_venv_choices',
-    'get_external_account',
     'ScheduleTaskManager',
     'ScheduleDependencyManager',
     'ScheduleWorkflowManager',
@@ -1089,29 +1088,6 @@ def has_model_field_prefetched(model_obj, field_name):
     return getattr(getattr(model_obj, field_name, None), 'prefetch_cache_name', '') in getattr(model_obj, '_prefetched_objects_cache', {})
 
 
-def get_external_account(user):
-    from django.conf import settings
-
-    account_type = None
-    if getattr(settings, 'AUTH_LDAP_SERVER_URI', None):
-        try:
-            if user.pk and user.profile.ldap_dn and not user.has_usable_password():
-                account_type = "ldap"
-        except AttributeError:
-            pass
-    if (
-        getattr(settings, 'SOCIAL_AUTH_GOOGLE_OAUTH2_KEY', None)
-        or getattr(settings, 'SOCIAL_AUTH_GITHUB_KEY', None)
-        or getattr(settings, 'SOCIAL_AUTH_GITHUB_ORG_KEY', None)
-        or getattr(settings, 'SOCIAL_AUTH_GITHUB_TEAM_KEY', None)
-        or getattr(settings, 'SOCIAL_AUTH_SAML_ENABLED_IDPS', None)
-    ) and user.social_auth.all():
-        account_type = "social"
-    if (getattr(settings, 'RADIUS_SERVER', None) or getattr(settings, 'TACACSPLUS_HOST', None)) and user.enterprise_auth.all():
-        account_type = "enterprise"
-    return account_type
-
-
 class classproperty:
     def __init__(self, fget=None, fset=None, fdel=None, doc=None):
         self.fget = fget

awx/main/utils/execution_environments.py

@@ -1,4 +1,5 @@
 import os
+import logging
 from pathlib import Path
 
 from django.conf import settings
@@ -6,8 +7,15 @@ from django.conf import settings
 from awx.main.models.execution_environments import ExecutionEnvironment
 
 
+logger = logging.getLogger(__name__)
+
+
 def get_control_plane_execution_environment():
-    return ExecutionEnvironment.objects.filter(organization=None, managed=True).first()
+    ee = ExecutionEnvironment.objects.filter(organization=None, managed=True).first()
+    if ee == None:
+        logger.error('Failed to find control plane ee, there are no managed EEs without organizations')
+        raise RuntimeError("Failed to find default control plane EE")
+    return ee
 
 
 def get_default_execution_environment():

awx/playbooks/project_update.yml

@@ -25,42 +25,47 @@
   connection: local
   name: Update source tree if necessary
   tasks:
-
+    - name: Delete project directory before update
-    - name: delete project directory before update
+      ansible.builtin.shell: set -o pipefail && find . -delete -print | tail -2  # volume mounted, cannot delete folder itself
-      command: "find -delete"  # volume mounted, cannot delete folder itself
+      register: reg
+      changed_when: reg.stdout_lines | length > 1
       args:
         chdir: "{{ project_path }}"
       tags:
         - delete
 
-    - block:
+    - name: Update project using git
-        - name: update project using git
+      tags:
-          git:
+        - update_git
-            dest: "{{project_path|quote}}"
+      block:
-            repo: "{{scm_url}}"
+        - name: Update project using git
-            version: "{{scm_branch|quote}}"
+          ansible.builtin.git:
-            refspec: "{{scm_refspec|default(omit)}}"
+            dest: "{{ project_path | quote }}"
-            force: "{{scm_clean}}"
+            repo: "{{ scm_url }}"
-            track_submodules: "{{scm_track_submodules|default(omit)}}"
+            version: "{{ scm_branch | quote }}"
-            accept_hostkey: "{{scm_accept_hostkey|default(omit)}}"
+            refspec: "{{ scm_refspec | default(omit) }}"
+            force: "{{ scm_clean }}"
+            track_submodules: "{{ scm_track_submodules | default(omit) }}"
+            accept_hostkey: "{{ scm_accept_hostkey | default(omit) }}"
           register: git_result
 
         - name: Set the git repository version
-          set_fact:
+          ansible.builtin.set_fact:
             scm_version: "{{ git_result['after'] }}"
           when: "'after' in git_result"
-      tags:
-        - update_git
 
-    - block:
+    - name: Update project using svn
-        - name: update project using svn
+      tags:
-          subversion:
+        - update_svn
-            dest: "{{project_path|quote}}"
+      block:
-            repo: "{{scm_url|quote}}"
+        - name: Update project using svn
-            revision: "{{scm_branch|quote}}"
+          ansible.builtin.subversion:
-            force: "{{scm_clean}}"
+            dest: "{{ project_path | quote }}"
-            username: "{{scm_username|default(omit)}}"
+            repo: "{{ scm_url | quote }}"
-            password: "{{scm_password|default(omit)}}"
+            revision: "{{ scm_branch | quote }}"
+            force: "{{ scm_clean }}"
+            username: "{{ scm_username | default(omit) }}"
+            password: "{{ scm_password | default(omit) }}"
             # must be in_place because folder pre-existing, because it is mounted
             in_place: true
           environment:
@@ -68,85 +73,90 @@
           register: svn_result
 
         - name: Set the svn repository version
-          set_fact:
+          ansible.builtin.set_fact:
             scm_version: "{{ svn_result['after'] }}"
           when: "'after' in svn_result"
 
-        - name: parse subversion version string properly
+        - name: Parse subversion version string properly
-          set_fact:
+          ansible.builtin.set_fact:
-            scm_version: "{{scm_version|regex_replace('^.*Revision: ([0-9]+).*$', '\\1')}}"
+            scm_version: "{{ scm_version | regex_replace('^.*Revision: ([0-9]+).*$', '\\1') }}"
-      tags:
-        - update_svn
 
-    - block:
+
+    - name: Project update for Insights
+      tags:
+        - update_insights
+      block:
         - name: Ensure the project directory is present
-          file:
+          ansible.builtin.file:
-            dest: "{{project_path|quote}}"
+            dest: "{{ project_path | quote }}"
             state: directory
+            mode: '0755'
 
         - name: Fetch Insights Playbook(s)
           insights:
-            insights_url: "{{insights_url}}"
+            insights_url: "{{ insights_url }}"
-            username: "{{scm_username}}"
+            username: "{{ scm_username }}"
-            password: "{{scm_password}}"
+            password: "{{ scm_password }}"
-            project_path: "{{project_path}}"
+            project_path: "{{ project_path }}"
-            awx_license_type: "{{awx_license_type}}"
+            awx_license_type: "{{ awx_license_type }}"
-            awx_version: "{{awx_version}}"
+            awx_version: "{{ awx_version }}"
           register: results
 
         - name: Save Insights Version
-          set_fact:
+          ansible.builtin.set_fact:
-            scm_version: "{{results.version}}"
+            scm_version: "{{ results.version }}"
           when: results is defined
-      tags:
-        - update_insights
 
-    - block:
+
+    - name: Update project using archive
+      tags:
+        - update_archive
+      block:
         - name: Ensure the project archive directory is present
-          file:
+          ansible.builtin.file:
-            dest: "{{ project_path|quote }}/.archive"
+            dest: "{{ project_path | quote }}/.archive"
             state: directory
+            mode: '0755'
 
         - name: Get archive from url
-          get_url:
+          ansible.builtin.get_url:
-            url: "{{ scm_url|quote }}"
+            url: "{{ scm_url | quote }}"
-            dest: "{{ project_path|quote }}/.archive/"
+            dest: "{{ project_path | quote }}/.archive/"
-            url_username: "{{ scm_username|default(omit) }}"
+            url_username: "{{ scm_username | default(omit) }}"
-            url_password: "{{ scm_password|default(omit) }}"
+            url_password: "{{ scm_password | default(omit) }}"
             force_basic_auth: true
+            mode: '0755'
           register: get_archive
 
         - name: Unpack archive
           project_archive:
             src: "{{ get_archive.dest }}"
-            project_path: "{{ project_path|quote }}"
+            project_path: "{{ project_path | quote }}"
             force: "{{ scm_clean }}"
           when: get_archive.changed or scm_clean
           register: unarchived
 
         - name: Find previous archives
-          find:
+          ansible.builtin.find:
-            paths: "{{ project_path|quote }}/.archive/"
+            paths: "{{ project_path | quote }}/.archive/"
             excludes:
-              - "{{ get_archive.dest|basename }}"
+              - "{{ get_archive.dest | basename }}"
           when: unarchived.changed
           register: previous_archive
 
         - name: Remove previous archives
-          file:
+          ansible.builtin.file:
             path: "{{ item.path }}"
             state: absent
           loop: "{{ previous_archive.files }}"
-          when: previous_archive.files|default([])
+          when: previous_archive.files | default([])
 
         - name: Set scm_version to archive sha1 checksum
-          set_fact:
+          ansible.builtin.set_fact:
             scm_version: "{{ get_archive.checksum_src }}"
-      tags:
-        - update_archive
 
     - name: Repository Version
-      debug:
+      ansible.builtin.debug:
         msg: "Repository Version {{ scm_version }}"
       tags:
         - update_git
@@ -183,60 +193,59 @@
     additional_collections_env:
       # These environment variables are used for installing collections, in addition to galaxy_task_env
       # setting the collections paths silences warnings
-      ANSIBLE_COLLECTIONS_PATHS: "{{projects_root}}/.__awx_cache/{{local_path}}/stage/requirements_collections"
+      ANSIBLE_COLLECTIONS_PATHS: "{{ projects_root }}/.__awx_cache/{{ local_path }}/stage/requirements_collections"
       # Put the local tmp directory in same volume as collection destination
       # otherwise, files cannot be moved accross volumes and will cause error
-      ANSIBLE_LOCAL_TEMP: "{{projects_root}}/.__awx_cache/{{local_path}}/stage/tmp"
+      ANSIBLE_LOCAL_TEMP: "{{ projects_root }}/.__awx_cache/{{ local_path }}/stage/tmp"
   tasks:
-
     - name: Check content sync settings
-      block:
+      when: not roles_enabled | bool and not collections_enabled | bool
-        - debug:
-            msg: >
-              Collection and role syncing disabled. Check the AWX_ROLES_ENABLED and
-              AWX_COLLECTIONS_ENABLED settings and Galaxy credentials on the project's organization.
-
-        - meta: end_play
-
-      when: not roles_enabled|bool and not collections_enabled|bool
       tags:
         - install_roles
         - install_collections
+      block:
+        - name: Warn about disabled content sync
+          ansible.builtin.debug:
+            msg: >
+              Collection and role syncing disabled. Check the AWX_ROLES_ENABLED and
+              AWX_COLLECTIONS_ENABLED settings and Galaxy credentials on the project's organization.
+        - name: End play due to disabled content sync
+          ansible.builtin.meta: end_play
 
-    - name: fetch galaxy roles from requirements.(yml/yaml)
+    - name: Fetch galaxy roles from requirements.(yml/yaml)
-      command: >
+      ansible.builtin.command: >
         ansible-galaxy role install -r {{ item }}
-        --roles-path {{projects_root}}/.__awx_cache/{{local_path}}/stage/requirements_roles
+        --roles-path {{ projects_root }}/.__awx_cache/{{ local_path }}/stage/requirements_roles
         {{ ' -' + 'v' * ansible_verbosity if ansible_verbosity else '' }}
       args:
-        chdir: "{{project_path|quote}}"
+        chdir: "{{ project_path | quote }}"
       register: galaxy_result
       with_fileglob:
-        - "{{project_path|quote}}/roles/requirements.yaml"
+        - "{{ project_path | quote }}/roles/requirements.yaml"
-        - "{{project_path|quote}}/roles/requirements.yml"
+        - "{{ project_path | quote }}/roles/requirements.yml"
       changed_when: "'was installed successfully' in galaxy_result.stdout"
       environment: "{{ galaxy_task_env }}"
-      when: roles_enabled|bool
+      when: roles_enabled | bool
       tags:
         - install_roles
 
-    - name: fetch galaxy collections from collections/requirements.(yml/yaml)
+    - name: Fetch galaxy collections from collections/requirements.(yml/yaml)
-      command: >
+      ansible.builtin.command: >
         ansible-galaxy collection install -r {{ item }}
-        --collections-path {{projects_root}}/.__awx_cache/{{local_path}}/stage/requirements_collections
+        --collections-path {{ projects_root }}/.__awx_cache/{{ local_path }}/stage/requirements_collections
         {{ ' -' + 'v' * ansible_verbosity if ansible_verbosity else '' }}
       args:
-        chdir: "{{project_path|quote}}"
+        chdir: "{{ project_path | quote }}"
       register: galaxy_collection_result
       with_fileglob:
-        - "{{project_path|quote}}/collections/requirements.yaml"
+        - "{{ project_path | quote }}/collections/requirements.yaml"
-        - "{{project_path|quote}}/collections/requirements.yml"
+        - "{{ project_path | quote }}/collections/requirements.yml"
-        - "{{project_path|quote}}/requirements.yaml"
+        - "{{ project_path | quote }}/requirements.yaml"
-        - "{{project_path|quote}}/requirements.yml"
+        - "{{ project_path | quote }}/requirements.yml"
       changed_when: "'Installing ' in galaxy_collection_result.stdout"
       environment: "{{ additional_collections_env | combine(galaxy_task_env) }}"
       when:
         - "ansible_version.full is version_compare('2.9', '>=')"
-        - collections_enabled|bool
+        - collections_enabled | bool
       tags:
         - install_collections

awx/settings/defaults.py

@@ -172,9 +172,7 @@ GLOBAL_JOB_EXECUTION_ENVIRONMENTS = [{'name': 'AWX EE (latest)', 'image': 'quay.
 # This image is distinguished from others by having "managed" set to True and users have limited
 # ability to modify it through the API.
 # If a registry credential is needed to pull the image, that can be provided to the awx-manage command
-
+CONTROL_PLANE_EXECUTION_ENVIRONMENT = 'quay.io/ansible/awx-ee:latest'
-# HACK: this is done temporarily for feature development, remove before merge
-CONTROL_PLANE_EXECUTION_ENVIRONMENT = 'quay.io/relrod/awx-ee-invlimit:latest'
 
 # Note: This setting may be overridden by database settings.
 STDOUT_MAX_BYTES_DISPLAY = 1048576
@@ -744,13 +742,6 @@ CUSTOM_EXCLUDE_EMPTY_GROUPS = False
 SCM_EXCLUDE_EMPTY_GROUPS = False
 # SCM_INSTANCE_ID_VAR =
 
-# ----------------
-# -- Constructed --
-# ----------------
-CONSTRUCTED_INSTANCE_ID_VAR = 'remote_tower_id'
-
-CONSTRUCTED_EXCLUDE_EMPTY_GROUPS = False
-
 # ---------------------
 # -- Activity Stream --
 # ---------------------

awx/sso/backends.py

@@ -385,10 +385,10 @@ def on_populate_user(sender, **kwargs):
             logger.warning('LDAP user {} has {} > max {} characters'.format(user.username, field, max_len))
 
     org_map = getattr(backend.settings, 'ORGANIZATION_MAP', {})
-    team_map = getattr(backend.settings, 'TEAM_MAP', {})
+    team_map_settings = getattr(backend.settings, 'TEAM_MAP', {})
     orgs_list = list(org_map.keys())
     team_map = {}
-    for team_name, team_opts in team_map.items():
+    for team_name, team_opts in team_map_settings.items():
         if not team_opts.get('organization', None):
             # You can't save the LDAP config in the UI w/o an org (or '' or null as the org) so if we somehow got this condition its an error
             logger.error("Team named {} in LDAP team map settings is invalid due to missing organization".format(team_name))
@@ -416,7 +416,7 @@ def on_populate_user(sender, **kwargs):
 
     # Compute in memory what the state is of the different LDAP teams
     desired_team_states = {}
-    for team_name, team_opts in team_map.items():
+    for team_name, team_opts in team_map_settings.items():
         if 'organization' not in team_opts:
             continue
         users_opts = team_opts.get('users', None)

awx/sso/common.py

@@ -169,3 +169,45 @@ def get_or_create_org_with_default_galaxy_cred(**kwargs):
         else:
             logger.debug("Could not find default Ansible Galaxy credential to add to org")
     return org
+
+
+def get_external_account(user):
+    account_type = None
+
+    # Previously this method also checked for active configuration which meant that if a user logged in from LDAP
+    #    and then LDAP was no longer configured it would "convert" the user from an LDAP account_type to none.
+    #    This did have one benefit that if a login type was removed intentionally the user could be given a username password.
+    #    But it had a limitation that the user would have to have an active session (or an admin would have to go set a temp password).
+    #    It also lead to the side affect that if LDAP was ever reconfigured the user would convert back to LDAP but still have a local password.
+    #    That local password could then be used to bypass LDAP authentication.
+    try:
+        if user.pk and user.profile.ldap_dn and not user.has_usable_password():
+            account_type = "ldap"
+    except AttributeError:
+        pass
+
+    if user.social_auth.all():
+        account_type = "social"
+
+    if user.enterprise_auth.all():
+        account_type = "enterprise"
+
+    return account_type
+
+
+def is_remote_auth_enabled():
+    from django.conf import settings
+
+    # Append LDAP, Radius, TACACS+ and SAML options
+    settings_that_turn_on_remote_auth = [
+        'AUTH_LDAP_SERVER_URI',
+        'SOCIAL_AUTH_SAML_ENABLED_IDPS',
+        'RADIUS_SERVER',
+        'TACACSPLUS_HOST',
+    ]
+    # Also include any SOCAIL_AUTH_*KEY (except SAML)
+    for social_auth_key in dir(settings):
+        if social_auth_key.startswith('SOCIAL_AUTH_') and social_auth_key.endswith('_KEY') and 'SAML' not in social_auth_key:
+            settings_that_turn_on_remote_auth.append(social_auth_key)
+
+    return any(getattr(settings, s, None) for s in settings_that_turn_on_remote_auth)

awx/sso/tests/functional/test_common.py

@@ -2,9 +2,22 @@ import pytest
 from collections import Counter
 from django.core.exceptions import FieldError
 from django.utils.timezone import now
+from django.test.utils import override_settings
 
 from awx.main.models import Credential, CredentialType, Organization, Team, User
-from awx.sso.common import get_orgs_by_ids, reconcile_users_org_team_mappings, create_org_and_teams, get_or_create_org_with_default_galaxy_cred
+from awx.sso.common import (
+    get_orgs_by_ids,
+    reconcile_users_org_team_mappings,
+    create_org_and_teams,
+    get_or_create_org_with_default_galaxy_cred,
+    is_remote_auth_enabled,
+    get_external_account,
+)
+
+
+class MicroMockObject(object):
+    def all(self):
+        return True
 
 
 @pytest.mark.django_db
@@ -278,3 +291,87 @@ class TestCommonFunctions:
 
         for o in Organization.objects.all():
             assert o.galaxy_credentials.count() == 0
+
+    @pytest.mark.parametrize(
+        "enable_ldap, enable_social, enable_enterprise, expected_results",
+        [
+            (False, False, False, None),
+            (True, False, False, 'ldap'),
+            (True, True, False, 'social'),
+            (True, True, True, 'enterprise'),
+            (False, True, True, 'enterprise'),
+            (False, False, True, 'enterprise'),
+            (False, True, False, 'social'),
+        ],
+    )
+    def test_get_external_account(self, enable_ldap, enable_social, enable_enterprise, expected_results):
+        try:
+            user = User.objects.get(username="external_tester")
+        except User.DoesNotExist:
+            user = User(username="external_tester")
+            user.set_unusable_password()
+            user.save()
+
+        if enable_ldap:
+            user.profile.ldap_dn = 'test.dn'
+        if enable_social:
+            from social_django.models import UserSocialAuth
+
+            social_auth, _ = UserSocialAuth.objects.get_or_create(
+                uid='667ec049-cdf3-45d0-a4dc-0465f7505954',
+                provider='oidc',
+                extra_data={},
+                user_id=user.id,
+            )
+            user.social_auth.set([social_auth])
+        if enable_enterprise:
+            from awx.sso.models import UserEnterpriseAuth
+
+            enterprise_auth = UserEnterpriseAuth(user=user, provider='tacacs+')
+            enterprise_auth.save()
+
+        assert get_external_account(user) == expected_results
+
+    @pytest.mark.parametrize(
+        "setting, expected",
+        [
+            # Set none of the social auth settings
+            ('JUNK_SETTING', False),
+            # Set the hard coded settings
+            ('AUTH_LDAP_SERVER_URI', True),
+            ('SOCIAL_AUTH_SAML_ENABLED_IDPS', True),
+            ('RADIUS_SERVER', True),
+            ('TACACSPLUS_HOST', True),
+            # Set some SOCIAL_SOCIAL_AUTH_OIDC_KEYAUTH_*_KEY settings
+            ('SOCIAL_AUTH_AZUREAD_OAUTH2_KEY', True),
+            ('SOCIAL_AUTH_GITHUB_ENTERPRISE_KEY', True),
+            ('SOCIAL_AUTH_GITHUB_ENTERPRISE_ORG_KEY', True),
+            ('SOCIAL_AUTH_GITHUB_ENTERPRISE_TEAM_KEY', True),
+            ('SOCIAL_AUTH_GITHUB_KEY', True),
+            ('SOCIAL_AUTH_GITHUB_ORG_KEY', True),
+            ('SOCIAL_AUTH_GITHUB_TEAM_KEY', True),
+            ('SOCIAL_AUTH_GOOGLE_OAUTH2_KEY', True),
+            ('SOCIAL_AUTH_OIDC_KEY', True),
+            # Try a hypothetical future one
+            ('SOCIAL_AUTH_GIBBERISH_KEY', True),
+            # Do a SAML one
+            ('SOCIAL_AUTH_SAML_SP_PRIVATE_KEY', False),
+        ],
+    )
+    def test_is_remote_auth_enabled(self, setting, expected):
+        with override_settings(**{setting: True}):
+            assert is_remote_auth_enabled() == expected
+
+    @pytest.mark.parametrize(
+        "key_one, key_one_value, key_two, key_two_value, expected",
+        [
+            ('JUNK_SETTING', True, 'JUNK2_SETTING', True, False),
+            ('AUTH_LDAP_SERVER_URI', True, 'SOCIAL_AUTH_AZUREAD_OAUTH2_KEY', True, True),
+            ('JUNK_SETTING', True, 'SOCIAL_AUTH_AZUREAD_OAUTH2_KEY', True, True),
+            ('AUTH_LDAP_SERVER_URI', False, 'SOCIAL_AUTH_AZUREAD_OAUTH2_KEY', False, False),
+        ],
+    )
+    def test_is_remote_auth_enabled_multiple_keys(self, key_one, key_one_value, key_two, key_two_value, expected):
+        with override_settings(**{key_one: key_one_value}):
+            with override_settings(**{key_two: key_two_value}):
+                assert is_remote_auth_enabled() == expected

awx/ui/src/api/index.js

@@ -6,7 +6,6 @@ import Config from './models/Config';
 import CredentialInputSources from './models/CredentialInputSources';
 import CredentialTypes from './models/CredentialTypes';
 import Credentials from './models/Credentials';
-import ConstructedInventories from './models/ConstructedInventories';
 import Dashboard from './models/Dashboard';
 import ExecutionEnvironments from './models/ExecutionEnvironments';
 import Groups from './models/Groups';
@@ -54,7 +53,6 @@ const ConfigAPI = new Config();
 const CredentialInputSourcesAPI = new CredentialInputSources();
 const CredentialTypesAPI = new CredentialTypes();
 const CredentialsAPI = new Credentials();
-const ConstructedInventoriesAPI = new ConstructedInventories();
 const DashboardAPI = new Dashboard();
 const ExecutionEnvironmentsAPI = new ExecutionEnvironments();
 const GroupsAPI = new Groups();
@@ -103,7 +101,6 @@ export {
   CredentialInputSourcesAPI,
   CredentialTypesAPI,
   CredentialsAPI,
-  ConstructedInventoriesAPI,
   DashboardAPI,
   ExecutionEnvironmentsAPI,
   GroupsAPI,

awx/ui/src/api/models/ConstructedInventories.js

@@ -1,10 +0,0 @@
-import Base from '../Base';
-import InstanceGroupsMixin from '../mixins/InstanceGroups.mixin';
-
-class ConstructedInventories extends InstanceGroupsMixin(Base) {
-  constructor(http) {
-    super(http);
-    this.baseUrl = 'api/v2/constructed_inventories/';
-  }
-}
-export default ConstructedInventories;

awx/ui/src/api/models/Inventories.js

@@ -13,7 +13,6 @@ class Inventories extends InstanceGroupsMixin(Base) {
     this.readGroups = this.readGroups.bind(this);
     this.readGroupsOptions = this.readGroupsOptions.bind(this);
     this.promoteGroup = this.promoteGroup.bind(this);
-    this.readInputInventories = this.readInputInventories.bind(this);
   }
 
   readAccessList(id, params) {
@@ -73,12 +72,6 @@ class Inventories extends InstanceGroupsMixin(Base) {
     });
   }
 
-  readInputInventories(inventoryId, params) {
-    return this.http.get(`${this.baseUrl}${inventoryId}/input_inventories/`, {
-      params,
-    });
-  }
-
   readSources(inventoryId, params) {
     return this.http.get(`${this.baseUrl}${inventoryId}/inventory_sources/`, {
       params,

awx/ui/src/screens/Credential/Credential.js

@@ -22,14 +22,19 @@ import { CredentialsAPI } from 'api';
 import CredentialDetail from './CredentialDetail';
 import CredentialEdit from './CredentialEdit';
 
-const jobTemplateCredentialTypes = [
+const unacceptableCredentialTypes = [
-  'machine',
+  'centrify_vault_kv',
-  'cloud',
+  'aim',
-  'net',
+  'conjur',
-  'ssh',
+  'hashivault_kv',
-  'vault',
+  'hashivault_ssh',
-  'kubernetes',
+  'azure_kv',
-  'cryptography',
+  'thycotic_dsv',
+  'thycotic_tss',
+  'galaxy_api_token',
+  'insights',
+  'registry',
+  'scm',
 ];
 
 function Credential({ setBreadcrumb }) {
@@ -86,7 +91,10 @@ function Credential({ setBreadcrumb }) {
       id: 1,
     },
   ];
-  if (jobTemplateCredentialTypes.includes(credential?.kind)) {
+  if (
+    !unacceptableCredentialTypes.includes(credential?.kind) &&
+    credential !== null
+  ) {
     tabsArray.push({
       name: t`Job Templates`,
       link: `/credentials/${id}/job_templates`,
@@ -115,12 +123,14 @@ function Credential({ setBreadcrumb }) {
       </PageSection>
     );
   }
+  if (hasContentLoading) {
+    return <ContentLoading />;
+  }
 
   return (
     <PageSection>
       <Card>
         {showCardHeader && <RoutedTabs tabsArray={tabsArray} />}
-        {hasContentLoading && <ContentLoading />}
         {!hasContentLoading && credential && (
           <Switch>
             <Redirect

awx/ui/src/screens/Credential/Credential.test.js

@@ -8,6 +8,7 @@ import {
 } from '../../../testUtils/enzymeHelpers';
 import mockMachineCredential from './shared/data.machineCredential.json';
 import mockSCMCredential from './shared/data.scmCredential.json';
+import mockCyberArkCredential from './shared/data.cyberArkCredential.json';
 import Credential from './Credential';
 
 jest.mock('../../api');
@@ -21,6 +22,11 @@ jest.mock('react-router-dom', () => ({
 
 describe('<Credential />', () => {
   let wrapper;
+  afterEach(() => {
+    jest.clearAllMocks();
+
+    wrapper.unmount();
+  });
 
   test('initially renders user-based machine credential successfully', async () => {
     CredentialsAPI.readDetail.mockResolvedValueOnce({
@@ -61,6 +67,19 @@ describe('<Credential />', () => {
     });
   });
 
+  test('should not render job template tab', async () => {
+    CredentialsAPI.readDetail.mockResolvedValueOnce({
+      data: { ...mockCyberArkCredential, kind: 'registry' },
+    });
+    const expectedTabs = ['Back to Credentials', 'Details', 'Access'];
+    await act(async () => {
+      wrapper = mountWithContexts(<Credential setBreadcrumb={() => {}} />);
+    });
+    wrapper.find('RoutedTabs li').forEach((tab, index) => {
+      expect(tab.text()).toEqual(expectedTabs[index]);
+    });
+  });
+
   test('should show content error when user attempts to navigate to erroneous route', async () => {
     const history = createMemoryHistory({
       initialEntries: ['/credentials/2/foobar'],
@@ -85,3 +104,4 @@ describe('<Credential />', () => {
     await waitForElement(wrapper, 'ContentError', (el) => el.length === 1);
   });
 });
+describe('<Credential> should not show job template tab', () => {});

awx/ui/src/screens/Inventory/AdvancedInventoryHost/index.js

@@ -1 +0,0 @@
-export { default } from './AdvancedInventoryHost';

awx/ui/src/screens/Inventory/AdvancedInventoryHostDetail/index.js

@@ -1 +0,0 @@
-export { default } from './AdvancedInventoryHostDetail';

awx/ui/src/screens/Inventory/AdvancedInventoryHosts/AdvancedInventoryHosts.js

@@ -1,27 +0,0 @@
-import React from 'react';
-import { Route, Switch } from 'react-router-dom';
-import { Inventory } from 'types';
-import AdvancedInventoryHostList from './AdvancedInventoryHostList';
-import AdvancedInventoryHost from '../AdvancedInventoryHost';
-
-function AdvancedInventoryHosts({ inventory, setBreadcrumb }) {
-  return (
-    <Switch>
-      <Route key="host" path="/inventories/:inventoryType/:id/hosts/:hostId">
-        <AdvancedInventoryHost
-          setBreadcrumb={setBreadcrumb}
-          inventory={inventory}
-        />
-      </Route>
-      <Route key="host-list" path="/inventories/:inventoryType/:id/hosts">
-        <AdvancedInventoryHostList inventory={inventory} />
-      </Route>
-    </Switch>
-  );
-}
-
-AdvancedInventoryHosts.propTypes = {
-  inventory: Inventory.isRequired,
-};
-
-export default AdvancedInventoryHosts;

awx/ui/src/screens/Inventory/AdvancedInventoryHosts/index.js

@@ -1 +0,0 @@
-export { default } from './AdvancedInventoryHosts';

awx/ui/src/screens/Inventory/ConstructedInventory.js

@@ -1,215 +0,0 @@
-import React, { useCallback, useEffect } from 'react';
-import { t } from '@lingui/macro';
-import {
-  Link,
-  Switch,
-  Route,
-  Redirect,
-  useRouteMatch,
-  useLocation,
-} from 'react-router-dom';
-import { CaretLeftIcon } from '@patternfly/react-icons';
-import { Card, PageSection } from '@patternfly/react-core';
-
-import useRequest from 'hooks/useRequest';
-import { ConstructedInventoriesAPI, InventoriesAPI } from 'api';
-
-import ContentError from 'components/ContentError';
-import ContentLoading from 'components/ContentLoading';
-import JobList from 'components/JobList';
-import RelatedTemplateList from 'components/RelatedTemplateList';
-import { ResourceAccessList } from 'components/ResourceAccessList';
-import RoutedTabs from 'components/RoutedTabs';
-import ConstructedInventoryDetail from './ConstructedInventoryDetail';
-import ConstructedInventoryEdit from './ConstructedInventoryEdit';
-import InventoryGroups from './InventoryGroups';
-import AdvancedInventoryHosts from './AdvancedInventoryHosts';
-import { getInventoryPath } from './shared/utils';
-
-function ConstructedInventory({ setBreadcrumb }) {
-  const location = useLocation();
-  const match = useRouteMatch('/inventories/constructed_inventory/:id');
-
-  const {
-    result: inventory,
-    error: contentError,
-    isLoading: hasContentLoading,
-    request: fetchInventory,
-  } = useRequest(
-    useCallback(async () => {
-      const { data } = await ConstructedInventoriesAPI.readDetail(
-        match.params.id
-      );
-      return data;
-    }, [match.params.id]),
-    { isLoading: true }
-  );
-
-  useEffect(() => {
-    fetchInventory();
-  }, [fetchInventory, location.pathname]);
-
-  useEffect(() => {
-    if (inventory) {
-      setBreadcrumb(inventory);
-    }
-  }, [inventory, setBreadcrumb]);
-
-  const tabsArray = [
-    {
-      name: (
-        <>
-          <CaretLeftIcon />
-          {t`Back to Inventories`}
-        </>
-      ),
-      link: `/inventories`,
-      id: 99,
-    },
-    { name: t`Details`, link: `${match.url}/details`, id: 0 },
-    { name: t`Access`, link: `${match.url}/access`, id: 1 },
-    { name: t`Hosts`, link: `${match.url}/hosts`, id: 2 },
-    { name: t`Groups`, link: `${match.url}/groups`, id: 3 },
-    {
-      name: t`Jobs`,
-      link: `${match.url}/jobs`,
-      id: 4,
-    },
-    { name: t`Job Templates`, link: `${match.url}/job_templates`, id: 5 },
-  ];
-
-  if (hasContentLoading) {
-    return (
-      <PageSection>
-        <Card>
-          <ContentLoading />
-        </Card>
-      </PageSection>
-    );
-  }
-
-  if (contentError) {
-    return (
-      <PageSection>
-        <Card>
-          <ContentError error={contentError}>
-            {contentError?.response?.status === 404 && (
-              <span>
-                {t`Constructed Inventory not found.`}{' '}
-                <Link to="/inventories">{t`View all Inventories.`}</Link>
-              </span>
-            )}
-          </ContentError>
-        </Card>
-      </PageSection>
-    );
-  }
-
-  if (inventory && inventory?.kind !== 'constructed') {
-    return <Redirect to={`${getInventoryPath(inventory)}/details`} />;
-  }
-
-  let showCardHeader = true;
-  if (
-    ['edit', 'add', 'groups/', 'hosts/'].some((name) =>
-      location.pathname.includes(name)
-    )
-  ) {
-    showCardHeader = false;
-  }
-
-  return (
-    <PageSection>
-      <Card>
-        {showCardHeader && <RoutedTabs tabsArray={tabsArray} />}
-        <Switch>
-          <Redirect
-            from="/inventories/constructed_inventory/:id"
-            to="/inventories/constructed_inventory/:id/details"
-            exact
-          />
-          {inventory && [
-            <Route
-              path="/inventories/constructed_inventory/:id/details"
-              key="details"
-            >
-              <ConstructedInventoryDetail
-                inventory={inventory}
-                hasInventoryLoading={hasContentLoading}
-              />
-            </Route>,
-            <Route
-              key="edit"
-              path="/inventories/constructed_inventory/:id/edit"
-            >
-              <ConstructedInventoryEdit />
-            </Route>,
-            <Route
-              path="/inventories/constructed_inventory/:id/access"
-              key="access"
-            >
-              <ResourceAccessList
-                resource={inventory}
-                apiModel={InventoriesAPI}
-              />
-            </Route>,
-            <Route
-              path="/inventories/constructed_inventory/:id/hosts"
-              key="hosts"
-            >
-              <AdvancedInventoryHosts
-                inventory={inventory}
-                setBreadcrumb={setBreadcrumb}
-              />
-            </Route>,
-            <Route
-              path="/inventories/constructed_inventory/:id/groups"
-              key="constructed_inventory_groups"
-            >
-              <InventoryGroups
-                inventory={inventory}
-                setBreadcrumb={setBreadcrumb}
-              />
-            </Route>,
-            <Route
-              key="jobs"
-              path="/inventories/constructed_inventory/:id/jobs"
-            >
-              <JobList
-                defaultParams={{
-                  or__job__inventory: inventory.id,
-                  or__adhoccommand__inventory: inventory.id,
-                  or__inventoryupdate__inventory_source__inventory:
-                    inventory.id,
-                  or__workflowjob__inventory: inventory.id,
-                }}
-              />
-            </Route>,
-            <Route
-              key="job_templates"
-              path="/inventories/constructed_inventory/:id/job_templates"
-            >
-              <RelatedTemplateList
-                searchParams={{ inventory__id: inventory.id }}
-              />
-            </Route>,
-          ]}
-          <Route path="*" key="not-found">
-            <ContentError isNotFound>
-              {match.params.id && (
-                <Link
-                  to={`/inventories/constructed_inventory/${match.params.id}/details`}
-                >
-                  {t`View Constructed Inventory Details`}
-                </Link>
-              )}
-            </ContentError>
-          </Route>
-        </Switch>
-      </Card>
-    </PageSection>
-  );
-}
-
-export { ConstructedInventory as _ConstructedInventory };
-export default ConstructedInventory;

awx/ui/src/screens/Inventory/ConstructedInventory.test.js

@@ -1,77 +0,0 @@
-import React from 'react';
-import { act } from 'react-dom/test-utils';
-import { createMemoryHistory } from 'history';
-import { ConstructedInventoriesAPI } from 'api';
-import {
-  mountWithContexts,
-  waitForElement,
-} from '../../../testUtils/enzymeHelpers';
-import mockInventory from './shared/data.inventory.json';
-import ConstructedInventory from './ConstructedInventory';
-
-jest.mock('../../api');
-jest.mock('react-router-dom', () => ({
-  ...jest.requireActual('react-router-dom'),
-  useRouteMatch: () => ({
-    url: '/constructed_inventories/1',
-    params: { id: 1 },
-  }),
-}));
-
-describe('<ConstructedInventory />', () => {
-  let wrapper;
-
-  test('should render expected tabs', async () => {
-    ConstructedInventoriesAPI.readDetail.mockResolvedValue({
-      data: mockInventory,
-    });
-    const expectedTabs = [
-      'Back to Inventories',
-      'Details',
-      'Access',
-      'Hosts',
-      'Groups',
-      'Jobs',
-      'Job Templates',
-    ];
-    await act(async () => {
-      wrapper = mountWithContexts(
-        <ConstructedInventory setBreadcrumb={() => {}} />
-      );
-    });
-    wrapper.find('RoutedTabs li').forEach((tab, index) => {
-      expect(tab.text()).toEqual(expectedTabs[index]);
-    });
-  });
-
-  test('should show content error when user attempts to navigate to erroneous route', async () => {
-    ConstructedInventoriesAPI.readDetail.mockResolvedValue({
-      data: { ...mockInventory, kind: 'constructed' },
-    });
-    const history = createMemoryHistory({
-      initialEntries: ['/inventories/constructed_inventory/1/foobar'],
-    });
-    await act(async () => {
-      wrapper = mountWithContexts(
-        <ConstructedInventory setBreadcrumb={() => {}} />,
-        {
-          context: {
-            router: {
-              history,
-              route: {
-                location: history.location,
-                match: {
-                  params: { id: 1 },
-                  url: '/inventories/constructed_inventory/1/foobar',
-                  path: '/inventories/:inventoryType/:id/foobar',
-                },
-              },
-            },
-          },
-        }
-      );
-    });
-    await waitForElement(wrapper, 'ContentLoading', (el) => el.length === 0);
-    expect(wrapper.find('ContentError').length).toBe(1);
-  });
-});

awx/ui/src/screens/Inventory/ConstructedInventoryAdd/ConstructedInventoryAdd.js

@@ -1,18 +0,0 @@
-/* eslint i18next/no-literal-string: "off" */
-import React from 'react';
-import { Card, PageSection } from '@patternfly/react-core';
-import { CardBody } from 'components/Card';
-
-function ConstructedInventoryAdd() {
-  return (
-    <PageSection>
-      <Card>
-        <CardBody>
-          <div>Coming Soon!</div>
-        </CardBody>
-      </Card>
-    </PageSection>
-  );
-}
-
-export default ConstructedInventoryAdd;

awx/ui/src/screens/Inventory/ConstructedInventoryAdd/ConstructedInventoryAdd.test.js

@@ -1,15 +0,0 @@
-import React from 'react';
-import { act } from 'react-dom/test-utils';
-import { mountWithContexts } from '../../../../testUtils/enzymeHelpers';
-import ConstructedInventoryAdd from './ConstructedInventoryAdd';
-
-describe('<ConstructedInventoryAdd />', () => {
-  test('initially renders successfully', async () => {
-    let wrapper;
-    await act(async () => {
-      wrapper = mountWithContexts(<ConstructedInventoryAdd />);
-    });
-    expect(wrapper.length).toBe(1);
-    expect(wrapper.find('ConstructedInventoryAdd').length).toBe(1);
-  });
-});

awx/ui/src/screens/Inventory/ConstructedInventoryAdd/index.js

@@ -1 +0,0 @@
-export { default } from './ConstructedInventoryAdd';

awx/ui/src/screens/Inventory/ConstructedInventoryDetail/ConstructedInventoryDetail.js

@@ -1,371 +0,0 @@
-import React, { useCallback, useEffect } from 'react';
-import { Link, useHistory } from 'react-router-dom';
-
-import { t } from '@lingui/macro';
-import {
-  Button,
-  Chip,
-  Label,
-  LabelGroup,
-  TextList,
-  TextListItem,
-  TextListItemVariants,
-  TextListVariants,
-  Tooltip,
-} from '@patternfly/react-core';
-import { InventoriesAPI, ConstructedInventoriesAPI } from 'api';
-import { Inventory } from 'types';
-import { formatDateString } from 'util/dates';
-import { relatedResourceDeleteRequests } from 'util/getRelatedResourceDeleteDetails';
-import useRequest, { useDismissableError } from 'hooks/useRequest';
-import AlertModal from 'components/AlertModal';
-import { CardBody, CardActionsRow } from 'components/Card';
-import ChipGroup from 'components/ChipGroup';
-import { VariablesDetail } from 'components/CodeEditor';
-import ContentError from 'components/ContentError';
-import ContentLoading from 'components/ContentLoading';
-import { DetailList, Detail, UserDateDetail } from 'components/DetailList';
-import DeleteButton from 'components/DeleteButton';
-import ErrorDetail from 'components/ErrorDetail';
-import InstanceGroupLabels from 'components/InstanceGroupLabels';
-import JobCancelButton from 'components/JobCancelButton';
-import Popover from 'components/Popover';
-import StatusLabel from 'components/StatusLabel';
-import ConstructedInventorySyncButton from './ConstructedInventorySyncButton';
-import useWsInventorySourcesDetails from '../shared/useWsInventorySourcesDetails';
-import getHelpText from '../shared/Inventory.helptext';
-
-function JobStatusLabel({ job }) {
-  if (!job) {
-    return null;
-  }
-
-  return (
-    <Tooltip
-      position="top"
-      content={
-        <>
-          <div>{t`MOST RECENT SYNC`}</div>
-          <div>
-            {t`JOB ID:`} {job.id}
-          </div>
-          <div>
-            {t`STATUS:`} {job.status.toUpperCase()}
-          </div>
-          {job.finished && (
-            <div>
-              {t`FINISHED:`} {formatDateString(job.finished)}
-            </div>
-          )}
-        </>
-      }
-      key={job.id}
-    >
-      <Link to={`/jobs/inventory/${job.id}`}>
-        <StatusLabel status={job.status} />
-      </Link>
-    </Tooltip>
-  );
-}
-
-function ConstructedInventoryDetail({ inventory }) {
-  const history = useHistory();
-  const helpText = getHelpText();
-
-  const {
-    result: { instanceGroups, inputInventories, inventorySource, actions },
-    request: fetchRelatedDetails,
-    error: contentError,
-    isLoading,
-  } = useRequest(
-    useCallback(async () => {
-      const [
-        instanceGroupsResponse,
-        inputInventoriesResponse,
-        inventorySourceResponse,
-        optionsResponse,
-      ] = await Promise.all([
-        InventoriesAPI.readInstanceGroups(inventory.id),
-        InventoriesAPI.readInputInventories(inventory.id),
-        InventoriesAPI.readSources(inventory.id),
-        ConstructedInventoriesAPI.readOptions(),
-      ]);
-
-      return {
-        instanceGroups: instanceGroupsResponse.data.results,
-        inputInventories: inputInventoriesResponse.data.results,
-        inventorySource: inventorySourceResponse.data.results[0],
-        actions: optionsResponse.data.actions.GET,
-      };
-    }, [inventory.id]),
-    {
-      instanceGroups: [],
-      inputInventories: [],
-      inventorySource: {},
-      actions: {},
-      isLoading: true,
-    }
-  );
-
-  useEffect(() => {
-    fetchRelatedDetails();
-  }, [fetchRelatedDetails]);
-
-  const wsInventorySource = useWsInventorySourcesDetails(inventorySource);
-  const inventorySourceSyncJob =
-    wsInventorySource.summary_fields?.current_job ||
-    wsInventorySource.summary_fields?.last_job ||
-    null;
-  const wsInventory = {
-    ...inventory,
-    ...wsInventorySource?.summary_fields?.inventory,
-  };
-
-  const { request: deleteInventory, error: deleteError } = useRequest(
-    useCallback(async () => {
-      await InventoriesAPI.destroy(inventory.id);
-      history.push(`/inventories`);
-    }, [inventory.id, history])
-  );
-
-  const { error, dismissError } = useDismissableError(deleteError);
-
-  const deleteDetailsRequests =
-    relatedResourceDeleteRequests.inventory(inventory);
-
-  if (isLoading) {
-    return <ContentLoading />;
-  }
-
-  if (contentError) {
-    return <ContentError error={contentError} />;
-  }
-
-  return (
-    <CardBody>
-      <DetailList>
-        <Detail
-          label={t`Name`}
-          value={inventory.name}
-          dataCy="constructed-inventory-name"
-        />
-        <Detail
-          label={t`Last Job Status`}
-          value={
-            inventorySourceSyncJob && (
-              <JobStatusLabel job={inventorySourceSyncJob} />
-            )
-          }
-        />
-        <Detail
-          label={t`Description`}
-          value={inventory.description}
-          dataCy="constructed-inventory-description"
-        />
-        <Detail
-          label={t`Type`}
-          value={t`Constructed Inventory`}
-          dataCy="constructed-inventory-type"
-        />
-        <Detail
-          label={actions.limit.label}
-          value={inventory.limit}
-          helpText={actions.limit.help_text}
-          dataCy="constructed-inventory-limit"
-        />
-        <Detail
-          label={t`Organization`}
-          dataCy="constructed-inventory-organization"
-          value={
-            <Link
-              to={`/organizations/${inventory.summary_fields?.organization.id}/details`}
-            >
-              {inventory.summary_fields?.organization.name}
-            </Link>
-          }
-        />
-        <Detail
-          label={actions.total_groups.label}
-          value={wsInventory.total_groups}
-          helpText={actions.total_groups.help_text}
-          dataCy="constructed-inventory-total-groups"
-        />
-        <Detail
-          label={actions.total_hosts.label}
-          value={wsInventory.total_hosts}
-          helpText={actions.total_hosts.help_text}
-          dataCy="constructed-inventory-total-hosts"
-        />
-        <Detail
-          label={actions.total_inventory_sources.label}
-          value={wsInventory.total_inventory_sources}
-          helpText={actions.total_inventory_sources.help_text}
-          dataCy="constructed-inventory-sources"
-        />
-        <Detail
-          label={actions.update_cache_timeout.label}
-          value={inventory.update_cache_timeout}
-          helpText={actions.update_cache_timeout.help_text}
-          dataCy="constructed-inventory-cache-timeout"
-        />
-        <Detail
-          label={actions.inventory_sources_with_failures.label}
-          value={wsInventory.inventory_sources_with_failures}
-          helpText={actions.inventory_sources_with_failures.help_text}
-          dataCy="constructed-inventory-sources-with-failures"
-        />
-        <Detail
-          label={actions.verbosity.label}
-          value={inventory.verbosity}
-          helpText={actions.verbosity.help_text}
-          dataCy="constructed-inventory-verbosity"
-        />
-        {instanceGroups && (
-          <Detail
-            fullWidth
-            label={t`Instance Groups`}
-            value={<InstanceGroupLabels labels={instanceGroups} isLinkable />}
-            isEmpty={instanceGroups.length === 0}
-            dataCy="constructed-inventory-instance-groups"
-          />
-        )}
-        {inventory.prevent_instance_group_fallback && (
-          <Detail
-            fullWidth
-            label={t`Enabled Options`}
-            dataCy="constructed-inventory-instance-group-fallback"
-            value={
-              <TextList component={TextListVariants.ul}>
-                {inventory.prevent_instance_group_fallback && (
-                  <TextListItem component={TextListItemVariants.li}>
-                    {t`Prevent Instance Group Fallback`}
-                    <Popover
-                      header={t`Prevent Instance Group Fallback`}
-                      content={helpText.preventInstanceGroupFallback}
-                    />
-                  </TextListItem>
-                )}
-              </TextList>
-            }
-          />
-        )}
-        <Detail
-          fullWidth
-          helpText={helpText.labels}
-          dataCy="constructed-inventory-labels"
-          label={t`Labels`}
-          value={
-            <ChipGroup
-              numChips={5}
-              totalChips={inventory.summary_fields.labels?.results?.length}
-            >
-              {inventory.summary_fields.labels?.results?.map((l) => (
-                <Chip key={l.id} isReadOnly>
-                  {l.name}
-                </Chip>
-              ))}
-            </ChipGroup>
-          }
-          isEmpty={inventory.summary_fields.labels?.results?.length === 0}
-        />
-        <Detail
-          fullWidth
-          label={t`Input Inventories`}
-          value={
-            <LabelGroup numLabels={5}>
-              {inputInventories?.map((inputInventory) => (
-                <Label
-                  color="blue"
-                  key={inputInventory.id}
-                  render={({ className, content, componentRef }) => (
-                    <Link
-                      className={className}
-                      innerRef={componentRef}
-                      to={`/inventories/inventory/${inputInventory.id}/details`}
-                    >
-                      {content}
-                    </Link>
-                  )}
-                >
-                  {inputInventory.name}
-                </Label>
-              ))}
-            </LabelGroup>
-          }
-          isEmpty={inputInventories?.length === 0}
-        />
-        <VariablesDetail
-          label={actions.source_vars.label}
-          helpText={helpText.variables()}
-          value={inventory.source_vars}
-          rows={4}
-          name="variables"
-          dataCy="inventory-detail-variables"
-        />
-        <UserDateDetail
-          label={actions.created.label}
-          date={inventory.created}
-          user={inventory.summary_fields.created_by}
-        />
-        <UserDateDetail
-          label={actions.modified.label}
-          date={inventory.modified}
-          user={inventory.summary_fields.modified_by}
-        />
-      </DetailList>
-      <CardActionsRow>
-        {inventory?.summary_fields?.user_capabilities?.edit && (
-          <Button
-            ouiaId="inventory-detail-edit-button"
-            component={Link}
-            to={`/inventories/constructed_inventory/${inventory.id}/edit`}
-          >
-            {t`Edit`}
-          </Button>
-        )}
-        {inventorySource?.summary_fields?.user_capabilities?.start &&
-          (['new', 'running', 'pending', 'waiting'].includes(
-            inventorySourceSyncJob?.status
-          ) ? (
-            <JobCancelButton
-              job={{ id: inventorySourceSyncJob.id, type: 'inventory_update' }}
-              errorTitle={t`Constructed Inventory Source Sync Error`}
-              title={t`Cancel Constructed Inventory Source Sync`}
-              errorMessage={t`Failed to cancel Constructed Inventory Source Sync`}
-              buttonText={t`Cancel Sync`}
-            />
-          ) : (
-            <ConstructedInventorySyncButton inventoryId={inventory.id} />
-          ))}
-        {inventory?.summary_fields?.user_capabilities?.delete && (
-          <DeleteButton
-            name={inventory.name}
-            modalTitle={t`Delete Inventory`}
-            onConfirm={deleteInventory}
-            deleteDetailsRequests={deleteDetailsRequests}
-            deleteMessage={t`This inventory is currently being used by other resources. Are you sure you want to delete it?`}
-          >
-            {t`Delete`}
-          </DeleteButton>
-        )}
-      </CardActionsRow>
-      {error && (
-        <AlertModal
-          isOpen={error}
-          variant="error"
-          title={t`Error!`}
-          onClose={dismissError}
-        >
-          {t`Failed to delete inventory.`}
-          <ErrorDetail error={error} />
-        </AlertModal>
-      )}
-    </CardBody>
-  );
-}
-
-ConstructedInventoryDetail.propTypes = {
-  inventory: Inventory.isRequired,
-};
-
-export default ConstructedInventoryDetail;

awx/ui/src/screens/Inventory/ConstructedInventoryDetail/ConstructedInventoryDetail.test.js

@@ -1,250 +0,0 @@
-import React from 'react';
-import { Router } from 'react-router-dom';
-import { InventoriesAPI, ConstructedInventoriesAPI } from 'api';
-import {
-  render,
-  screen,
-  waitForElementToBeRemoved,
-} from '@testing-library/react';
-import '@testing-library/jest-dom';
-import { createMemoryHistory } from 'history';
-import { I18nProvider } from '@lingui/react';
-import { i18n } from '@lingui/core';
-import { en } from 'make-plural/plurals';
-import english from '../../../locales/en/messages';
-import ConstructedInventoryDetail from './ConstructedInventoryDetail';
-
-jest.mock('../../../api');
-
-const mockInventory = {
-  id: 1,
-  type: 'inventory',
-  summary_fields: {
-    organization: {
-      id: 1,
-      name: 'The Organization',
-      description: '',
-    },
-    created_by: {
-      username: 'the_creator',
-      id: 2,
-    },
-    modified_by: {
-      username: 'the_modifier',
-      id: 3,
-    },
-    user_capabilities: {
-      edit: true,
-      delete: true,
-      copy: true,
-      adhoc: true,
-    },
-    labels: {
-      count: 1,
-      results: [
-        {
-          id: 17,
-          name: 'seventeen',
-        },
-      ],
-    },
-  },
-  created: '2019-10-04T16:56:48.025455Z',
-  modified: '2019-10-04T16:56:48.025468Z',
-  name: 'Constructed Inv',
-  description: '',
-  organization: 1,
-  kind: 'constructed',
-  has_active_failures: false,
-  total_hosts: 0,
-  hosts_with_active_failures: 0,
-  total_groups: 0,
-  groups_with_active_failures: 0,
-  has_inventory_sources: false,
-  total_inventory_sources: 0,
-  inventory_sources_with_failures: 0,
-  pending_deletion: false,
-  prevent_instance_group_fallback: true,
-  update_cache_timeout: 0,
-  limit: '',
-  verbosity: 1,
-  source_vars:
-    '{\n    "plugin": "constructed",\n    "strict": true,\n    "groups": {\n        "shutdown": "resolved_state == \\"shutdown\\"",\n        "shutdown_in_product_dev": "resolved_state == \\"shutdown\\" and account_alias == \\"product_dev\\""\n    },\n    "compose": {\n        "resolved_state": "state | default(\\"running\\")"\n    }\n}',
-};
-
-describe('<ConstructedInventoryDetail />', () => {
-  const history = createMemoryHistory({
-    initialEntries: ['/inventories/constructed_inventory/1/details'],
-  });
-
-  const Component = (props) => (
-    <I18nProvider i18n={i18n}>
-      <Router history={history}>
-        <ConstructedInventoryDetail inventory={mockInventory} {...props} />
-      </Router>
-    </I18nProvider>
-  );
-
-  beforeEach(() => {
-    i18n.loadLocaleData({ en: { plurals: en } });
-    i18n.load({ en: english });
-    i18n.activate('en');
-
-    InventoriesAPI.readInstanceGroups.mockResolvedValue({
-      data: { results: [] },
-    });
-    InventoriesAPI.readInputInventories.mockResolvedValue({
-      data: {
-        results: [
-          {
-            id: 123,
-            name: 'input_inventory_123',
-          },
-          {
-            id: 456,
-            name: 'input_inventory_456',
-          },
-        ],
-      },
-    });
-    InventoriesAPI.readSources.mockResolvedValue({
-      data: {
-        results: [
-          {
-            id: 999,
-            type: 'inventory_source',
-            summary_fields: {
-              last_job: {
-                id: 101,
-                name: 'Auto-created source for: Constructed Inv',
-                status: 'successful',
-                finished: '2023-02-02T22:22:22.222220Z',
-              },
-              user_capabilities: {
-                start: true,
-              },
-            },
-          },
-        ],
-      },
-    });
-    ConstructedInventoriesAPI.readOptions.mockResolvedValue({
-      data: {
-        related: {},
-        actions: {
-          GET: {
-            limit: {
-              label: 'Limit',
-              help_text: '',
-            },
-            total_groups: {
-              label: 'Total Groups',
-              help_text: '',
-            },
-            total_hosts: {
-              label: 'Total Hosts',
-              help_text: '',
-            },
-            total_inventory_sources: {
-              label: 'Total inventory sources',
-              help_text: '',
-            },
-            update_cache_timeout: {
-              label: 'Update cache timeout',
-              help_text: '',
-            },
-            inventory_sources_with_failures: {
-              label: 'Inventory sources with failures',
-              help_text: '',
-            },
-            source_vars: {
-              label: 'Source vars',
-              help_text: '',
-            },
-            verbosity: {
-              label: 'Verbosity',
-              help_text: '',
-            },
-            created: {
-              label: 'Created by',
-              help_text: '',
-            },
-            modified: {
-              label: 'Modified by',
-              help_text: '',
-            },
-          },
-        },
-      },
-    });
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  test('should render details', async () => {
-    render(<Component />);
-    await waitForElementToBeRemoved(() => screen.getByRole('progressbar'));
-    expect(screen.getByText('Name')).toBeInTheDocument();
-    expect(screen.getByText('Constructed Inv')).toBeInTheDocument();
-    expect(screen.getByText('Last Job Status')).toBeInTheDocument();
-    expect(screen.getByText('Successful')).toBeInTheDocument();
-    expect(screen.getByText('Type')).toBeInTheDocument();
-    expect(screen.getByText('Constructed Inventory')).toBeInTheDocument();
-  });
-
-  test('should render action buttons', async () => {
-    render(<Component />);
-    await waitForElementToBeRemoved(() => screen.getByRole('progressbar'));
-    expect(screen.getByRole('link', { name: 'Edit' })).toHaveAttribute(
-      'href',
-      '/inventories/constructed_inventory/1/edit'
-    );
-    expect(
-      screen.getByRole('button', { name: 'Start inventory source sync' })
-    ).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: 'Delete' })).toBeInTheDocument();
-  });
-
-  test('should show cancel sync button during an inventory source sync running job', async () => {
-    InventoriesAPI.readSources.mockResolvedValue({
-      data: {
-        results: [
-          {
-            id: 999,
-            type: 'inventory_source',
-            summary_fields: {
-              current_job: {
-                id: 111,
-                name: 'Auto-created source for: Constructed Inv',
-                status: 'running',
-              },
-              user_capabilities: {
-                start: true,
-              },
-            },
-          },
-        ],
-      },
-    });
-    render(<Component />);
-    await waitForElementToBeRemoved(() => screen.getByRole('progressbar'));
-    expect(
-      screen.getByRole('button', {
-        name: 'Cancel Constructed Inventory Source Sync',
-      })
-    ).toBeInTheDocument();
-  });
-
-  test('should show error when the api throws while fetching details', async () => {
-    InventoriesAPI.readInputInventories.mockRejectedValueOnce(new Error());
-    render(<Component />);
-    await waitForElementToBeRemoved(() => screen.getByRole('progressbar'));
-    expect(
-      screen.getByText(
-        'There was an error loading this content. Please reload the page.'
-      )
-    ).toBeInTheDocument();
-  });
-});

awx/ui/src/screens/Inventory/ConstructedInventoryDetail/ConstructedInventorySyncButton.js

@@ -1,59 +0,0 @@
-import React, { useCallback } from 'react';
-import { t } from '@lingui/macro';
-import PropTypes from 'prop-types';
-import { Button, Tooltip } from '@patternfly/react-core';
-import useRequest, { useDismissableError } from 'hooks/useRequest';
-import AlertModal from 'components/AlertModal/AlertModal';
-import ErrorDetail from 'components/ErrorDetail/ErrorDetail';
-import { InventoriesAPI } from 'api';
-
-function ConstructedInventorySyncButton({ inventoryId }) {
-  const testId = `constructed-inventory-${inventoryId}-sync`;
-  const {
-    isLoading: startSyncLoading,
-    error: startSyncError,
-    request: startSyncProcess,
-  } = useRequest(
-    useCallback(
-      async () => InventoriesAPI.syncAllSources(inventoryId),
-      [inventoryId]
-    ),
-    {}
-  );
-
-  const { error: startError, dismissError: dismissStartError } =
-    useDismissableError(startSyncError);
-
-  return (
-    <>
-      <Tooltip content={t`Start sync process`} position="top">
-        <Button
-          ouiaId={testId}
-          isDisabled={startSyncLoading}
-          aria-label={t`Start inventory source sync`}
-          variant="secondary"
-          onClick={startSyncProcess}
-        >
-          {t`Sync`}
-        </Button>
-      </Tooltip>
-      {startError && (
-        <AlertModal
-          isOpen={startError}
-          variant="error"
-          title={t`Error!`}
-          onClose={dismissStartError}
-        >
-          {t`Failed to sync constructed inventory source`}
-          <ErrorDetail error={startError} />
-        </AlertModal>
-      )}
-    </>
-  );
-}
-
-ConstructedInventorySyncButton.propTypes = {
-  inventoryId: PropTypes.number.isRequired,
-};
-
-export default ConstructedInventorySyncButton;

awx/ui/src/screens/Inventory/ConstructedInventoryDetail/ConstructedInventorySyncButton.test.js

@@ -1,41 +0,0 @@
-import React from 'react';
-import { InventoriesAPI } from 'api';
-import ConstructedInventorySyncButton from './ConstructedInventorySyncButton';
-import { render, fireEvent, screen, waitFor } from '@testing-library/react';
-import '@testing-library/jest-dom';
-
-jest.mock('../../../api');
-
-const inventory = { id: 100, name: 'Constructed Inventory' };
-
-describe('<ConstructedInventorySyncButton />', () => {
-  const Component = () => (
-    <ConstructedInventorySyncButton inventoryId={inventory.id} />
-  );
-
-  test('should render start sync button', () => {
-    render(<Component />);
-    expect(
-      screen.getByRole('button', { name: 'Start inventory source sync' })
-    ).toBeInTheDocument();
-  });
-
-  test('should make expected api request on sync', async () => {
-    render(<Component />);
-    const syncButton = screen.queryByText('Sync');
-    fireEvent.click(syncButton);
-    await waitFor(() =>
-      expect(InventoriesAPI.syncAllSources).toHaveBeenCalledWith(100)
-    );
-  });
-
-  test('should show alert modal on throw', async () => {
-    InventoriesAPI.syncAllSources.mockRejectedValueOnce(new Error());
-    render(<Component />);
-    await waitFor(() => {
-      const syncButton = screen.queryByText('Sync');
-      fireEvent.click(syncButton);
-    });
-    expect(screen.getByRole('dialog', { name: 'Alert modal Error!' }));
-  });
-});

awx/ui/src/screens/Inventory/ConstructedInventoryDetail/index.js

@@ -1 +0,0 @@
-export { default } from './ConstructedInventoryDetail';

awx/ui/src/screens/Inventory/ConstructedInventoryEdit/ConstructedInventoryEdit.js

@@ -1,13 +0,0 @@
-/* eslint i18next/no-literal-string: "off" */
-import React from 'react';
-import { CardBody } from 'components/Card';
-
-function ConstructedInventoryEdit() {
-  return (
-    <CardBody>
-      <div>Coming Soon!</div>
-    </CardBody>
-  );
-}
-
-export default ConstructedInventoryEdit;

awx/ui/src/screens/Inventory/ConstructedInventoryEdit/ConstructedInventoryEdit.test.js

@@ -1,15 +0,0 @@
-import React from 'react';
-import { act } from 'react-dom/test-utils';
-import { mountWithContexts } from '../../../../testUtils/enzymeHelpers';
-import ConstructedInventoryEdit from './ConstructedInventoryEdit';
-
-describe('<ConstructedInventoryEdit />', () => {
-  test('initially renders successfully', async () => {
-    let wrapper;
-    await act(async () => {
-      wrapper = mountWithContexts(<ConstructedInventoryEdit />);
-    });
-    expect(wrapper.length).toBe(1);
-    expect(wrapper.find('ConstructedInventoryEdit').length).toBe(1);
-  });
-});

awx/ui/src/screens/Inventory/ConstructedInventoryEdit/index.js

@@ -1 +0,0 @@
-export { default } from './ConstructedInventoryEdit';

awx/ui/src/screens/Inventory/Inventories.js

@@ -9,18 +9,14 @@ import PersistentFilters from 'components/PersistentFilters';
 import { InventoryList } from './InventoryList';
 import Inventory from './Inventory';
 import SmartInventory from './SmartInventory';
-import ConstructedInventory from './ConstructedInventory';
 import InventoryAdd from './InventoryAdd';
 import SmartInventoryAdd from './SmartInventoryAdd';
-import ConstructedInventoryAdd from './ConstructedInventoryAdd';
-import { getInventoryPath } from './shared/utils';
 
 function Inventories() {
   const initScreenHeader = useRef({
     '/inventories': t`Inventories`,
     '/inventories/inventory/add': t`Create new inventory`,
     '/inventories/smart_inventory/add': t`Create new smart inventory`,
-    '/inventories/constructed_inventory/add': t`Create new constructed inventory`,
   });
 
   const [breadcrumbConfig, setScreenHeader] = useState(
@@ -49,7 +45,10 @@ function Inventories() {
         return;
       }
 
-      const inventoryPath = getInventoryPath(inventory);
+      const inventoryKind =
+        inventory.kind === 'smart' ? 'smart_inventory' : 'inventory';
+
+      const inventoryPath = `/inventories/${inventoryKind}/${inventory.id}`;
       const inventoryHostsPath = `${inventoryPath}/hosts`;
       const inventoryGroupsPath = `${inventoryPath}/groups`;
       const inventorySourcesPath = `${inventoryPath}/sources`;
@@ -110,9 +109,6 @@ function Inventories() {
         <Route path="/inventories/smart_inventory/add">
           <SmartInventoryAdd />
         </Route>
-        <Route path="/inventories/constructed_inventory/add">
-          <ConstructedInventoryAdd />
-        </Route>
         <Route path="/inventories/inventory/:id">
           <Config>
             {({ me }) => (
@@ -123,9 +119,6 @@ function Inventories() {
         <Route path="/inventories/smart_inventory/:id">
           <SmartInventory setBreadcrumb={setBreadcrumbConfig} />
         </Route>
-        <Route path="/inventories/constructed_inventory/:id">
-          <ConstructedInventory setBreadcrumb={setBreadcrumbConfig} />
-        </Route>
         <Route path="/inventories">
           <PersistentFilters pageKey="inventories">
             <InventoryList />

awx/ui/src/screens/Inventory/Inventory.js

@@ -23,7 +23,6 @@ import InventoryEdit from './InventoryEdit';
 import InventoryGroups from './InventoryGroups';
 import InventoryHosts from './InventoryHosts/InventoryHosts';
 import InventorySources from './InventorySources';
-import { getInventoryPath } from './shared/utils';
 
 function Inventory({ setBreadcrumb }) {
   const [contentError, setContentError] = useState(null);
@@ -112,8 +111,10 @@ function Inventory({ setBreadcrumb }) {
     showCardHeader = false;
   }
 
-  if (inventory && inventory?.kind !== '') {
+  if (inventory?.kind === 'smart') {
-    return <Redirect to={`${getInventoryPath(inventory)}/details`} />;
+    return (
+      <Redirect to={`/inventories/smart_inventory/${inventory.id}/details`} />
+    );
   }
 
   return (

awx/ui/src/screens/Inventory/InventoryGroup/InventoryGroup.js

@@ -23,7 +23,7 @@ function InventoryGroup({ setBreadcrumb, inventory }) {
   const [inventoryGroup, setInventoryGroup] = useState(null);
   const [contentLoading, setContentLoading] = useState(true);
   const [contentError, setContentError] = useState(null);
-  const { id: inventoryId, groupId, inventoryType } = useParams();
+  const { id: inventoryId, groupId } = useParams();
   const location = useLocation();
 
   useEffect(() => {
@@ -50,22 +50,22 @@ function InventoryGroup({ setBreadcrumb, inventory }) {
           {t`Back to Groups`}
         </>
       ),
-      link: `/inventories/${inventoryType}/${inventoryId}/groups`,
+      link: `/inventories/inventory/${inventory.id}/groups`,
       id: 99,
     },
     {
       name: t`Details`,
-      link: `/inventories/${inventoryType}/${inventoryId}/groups/${inventoryGroup?.id}/details`,
+      link: `/inventories/inventory/${inventory.id}/groups/${inventoryGroup?.id}/details`,
       id: 0,
     },
     {
       name: t`Related Groups`,
-      link: `/inventories/${inventoryType}/${inventoryId}/groups/${inventoryGroup?.id}/nested_groups`,
+      link: `/inventories/inventory/${inventory.id}/groups/${inventoryGroup?.id}/nested_groups`,
       id: 1,
     },
     {
       name: t`Hosts`,
-      link: `/inventories/${inventoryType}/${inventoryId}/groups/${inventoryGroup?.id}/nested_hosts`,
+      link: `/inventories/inventory/${inventory.id}/groups/${inventoryGroup?.id}/nested_hosts`,
       id: 2,
     },
   ];
@@ -105,32 +105,32 @@ function InventoryGroup({ setBreadcrumb, inventory }) {
       {showCardHeader && <RoutedTabs tabsArray={tabsArray} />}
       <Switch>
         <Redirect
-          from="/inventories/:inventoryType/:id/groups/:groupId"
+          from="/inventories/inventory/:id/groups/:groupId"
-          to="/inventories/:inventoryType/:id/groups/:groupId/details"
+          to="/inventories/inventory/:id/groups/:groupId/details"
           exact
         />
         {inventoryGroup && [
           <Route
             key="edit"
-            path="/inventories/:inventoryType/:id/groups/:groupId/edit"
+            path="/inventories/inventory/:id/groups/:groupId/edit"
           >
             <InventoryGroupEdit inventoryGroup={inventoryGroup} />
           </Route>,
           <Route
             key="details"
-            path="/inventories/:inventoryType/:id/groups/:groupId/details"
+            path="/inventories/inventory/:id/groups/:groupId/details"
           >
             <InventoryGroupDetail inventoryGroup={inventoryGroup} />
           </Route>,
           <Route
             key="hosts"
-            path="/inventories/:inventoryType/:id/groups/:groupId/nested_hosts"
+            path="/inventories/inventory/:id/groups/:groupId/nested_hosts"
           >
             <InventoryGroupHosts inventoryGroup={inventoryGroup} />
           </Route>,
           <Route
             key="relatedGroups"
-            path="/inventories/:inventoryType/:id/groups/:groupId/nested_groups"
+            path="/inventories/inventory/:id/groups/:groupId/nested_groups"
           >
             <InventoryRelatedGroups />
           </Route>,
@@ -138,7 +138,7 @@ function InventoryGroup({ setBreadcrumb, inventory }) {
         <Route key="not-found" path="*">
           <ContentError>
             {inventory && (
-              <Link to={`/inventories/:inventoryType/${inventory.id}/details`}>
+              <Link to={`/inventories/inventory/${inventory.id}/details`}>
                 {t`View Inventory Details`}
               </Link>
             )}

awx/ui/src/screens/Inventory/InventoryGroup/InventoryGroup.test.js

@@ -11,16 +11,15 @@ import {
 import InventoryGroup from './InventoryGroup';
 
 jest.mock('../../../api');
-describe('<InventoryGroup />', () => {
+jest.mock('react-router-dom', () => ({
-  jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
-    ...jest.requireActual('react-router-dom'),
+  useParams: () => ({
-    useParams: () => ({
+    id: 1,
-      id: 1,
+    groupId: 2,
-      groupId: 1,
+  }),
-      inventoryType: 'inventory',
+}));
-    }),
-  }));
 
+describe('<InventoryGroup />', () => {
   let wrapper;
   let history;
   const inventory = { id: 1, name: 'Foo' };
@@ -42,11 +41,11 @@ describe('<InventoryGroup />', () => {
       },
     });
     history = createMemoryHistory({
-      initialEntries: [`/inventories/inventory/1/groups/1/details`],
+      initialEntries: ['/inventories/inventory/1/groups/1/details'],
     });
     await act(async () => {
       wrapper = mountWithContexts(
-        <Route path="/inventories/:inventoryType/:id/groups">
+        <Route path="/inventories/inventory/:id/groups">
           <InventoryGroup setBreadcrumb={() => {}} inventory={inventory} />
         </Route>,
         { context: { router: { history } } }
@@ -64,7 +63,7 @@ describe('<InventoryGroup />', () => {
     expect(routedTabs).toHaveLength(1);
 
     const tabs = routedTabs.prop('tabsArray');
-    expect(tabs[0].link).toEqual(`/inventories/inventory/1/groups`);
+    expect(tabs[0].link).toEqual('/inventories/inventory/1/groups');
     expect(tabs[1].name).toEqual('Details');
     expect(tabs[2].name).toEqual('Related Groups');
     expect(tabs[3].name).toEqual('Hosts');
@@ -72,7 +71,7 @@ describe('<InventoryGroup />', () => {
 
   test('should show content error when user attempts to navigate to erroneous route', async () => {
     history = createMemoryHistory({
-      initialEntries: [`/inventories/inventory/1/groups/1/foobar`],
+      initialEntries: ['/inventories/inventory/1/groups/1/foobar'],
     });
     await act(async () => {
       wrapper = mountWithContexts(
@@ -93,60 +92,3 @@ describe('<InventoryGroup />', () => {
     await waitForElement(wrapper, 'ContentError', (el) => el.length === 1);
   });
 });
-
-describe('constructed inventory', () => {
-  let wrapper;
-  let history;
-  const inventory = { id: 1, name: 'Foo' };
-
-  jest.mock('react-router-dom', () => ({
-    ...jest.requireActual('react-router-dom'),
-    useParams: () => ({
-      id: 1,
-      groupId: 2,
-      inventoryType: 'constructed_inventory',
-    }),
-  }));
-
-  beforeEach(async () => {
-    GroupsAPI.readDetail.mockResolvedValue({
-      data: {
-        id: 1,
-        name: 'Foo',
-        description: 'Bar',
-        variables: 'bizz: buzz',
-        summary_fields: {
-          inventory: { id: 1 },
-          created_by: { id: 1, username: 'Athena' },
-          modified_by: { id: 1, username: 'Apollo' },
-        },
-        created: '2020-04-25T01:23:45.678901Z',
-        modified: '2020-04-25T01:23:45.678901Z',
-      },
-    });
-    history = createMemoryHistory({
-      initialEntries: [`/inventories/constructed_inventory/1/groups/1/details`],
-    });
-
-    await act(async () => {
-      wrapper = mountWithContexts(
-        <Route path="/inventories/:inventoryType/:id/groups">
-          <InventoryGroup setBreadcrumb={() => {}} inventory={inventory} />
-        </Route>,
-        { context: { router: { history } } }
-      );
-    });
-    await waitForElement(wrapper, 'ContentLoading', (el) => el.length === 0);
-  });
-
-  test('Constructed Inventory expect all tabs to exist, including Back to Groups', () => {
-    const routedTabs = wrapper.find('RoutedTabs');
-    expect(routedTabs).toHaveLength(1);
-
-    const tabs = routedTabs.prop('tabsArray');
-    expect(tabs[0].link).toEqual(`/inventories/constructed_inventory/1/groups`);
-    expect(tabs[1].name).toEqual('Details');
-    expect(tabs[2].name).toEqual('Related Groups');
-    expect(tabs[3].name).toEqual('Hosts');
-  });
-});

awx/ui/src/screens/Inventory/InventoryGroupDetail/InventoryGroupDetail.js

@@ -1,8 +1,9 @@
 import React, { useState } from 'react';
 import { t } from '@lingui/macro';
-import { useHistory, useParams } from 'react-router-dom';
+
 import { Button } from '@patternfly/react-core';
 
+import { useHistory, useParams } from 'react-router-dom';
 import { VariablesDetail } from 'components/CodeEditor';
 import { CardBody, CardActionsRow } from 'components/Card';
 import ErrorDetail from 'components/ErrorDetail';
@@ -11,7 +12,6 @@ import { DetailList, Detail, UserDateDetail } from 'components/DetailList';
 import InventoryGroupsDeleteModal from '../shared/InventoryGroupsDeleteModal';
 
 function InventoryGroupDetail({ inventoryGroup }) {
-  const { inventoryType, id, groupId } = useParams();
   const {
     summary_fields: { created_by, modified_by, user_capabilities },
     created,
@@ -22,6 +22,7 @@ function InventoryGroupDetail({ inventoryGroup }) {
   } = inventoryGroup;
   const [error, setError] = useState(false);
   const history = useHistory();
+  const params = useParams();
 
   return (
     <CardBody>
@@ -46,33 +47,31 @@ function InventoryGroupDetail({ inventoryGroup }) {
           user={modified_by}
         />
       </DetailList>
-      {inventoryType !== 'constructed_inventory' && (
+      <CardActionsRow>
-        <CardActionsRow>
+        {user_capabilities?.edit && (
-          {user_capabilities?.edit && (
+          <Button
-            <Button
+            ouiaId="inventory-group-detail-edit-button"
-              ouiaId="inventory-group-detail-edit-button"
+            variant="primary"
-              variant="primary"
+            aria-label={t`Edit`}
-              aria-label={t`Edit`}
+            onClick={() =>
-              onClick={() =>
+              history.push(
-                history.push(
+                `/inventories/inventory/${params.id}/groups/${params.groupId}/edit`
-                  `/inventories/inventory/${id}/groups/${groupId}/edit`
+              )
-                )
+            }
-              }
+          >
-            >
+            {t`Edit`}
-              {t`Edit`}
+          </Button>
-            </Button>
+        )}
-          )}
+        {user_capabilities?.delete && (
-          {user_capabilities?.delete && (
+          <InventoryGroupsDeleteModal
-            <InventoryGroupsDeleteModal
+            groups={[inventoryGroup]}
-              groups={[inventoryGroup]}
+            isDisabled={false}
-              isDisabled={false}
+            onAfterDelete={() =>
-              onAfterDelete={() =>
+              history.push(`/inventories/inventory/${params.id}/groups`)
-                history.push(`/inventories/inventory/${id}/groups`)
+            }
-              }
+          />
-            />
+        )}
-          )}
+      </CardActionsRow>
-        </CardActionsRow>
-      )}
       {error && (
         <AlertModal
           variant="error"

awx/ui/src/screens/Inventory/InventoryGroupDetail/InventoryGroupDetail.test.js

@@ -39,14 +39,6 @@ describe('<InventoryGroupDetail />', () => {
   let history;
 
   describe('User has full permissions', () => {
-    jest.mock('react-router-dom', () => ({
-      ...jest.requireActual('react-router-dom'),
-      useParams: () => ({
-        id: 1,
-        groupId: 3,
-        inventoryType: 'inventory',
-      }),
-    }));
     beforeEach(async () => {
       await act(async () => {
         history = createMemoryHistory({
@@ -124,14 +116,6 @@ describe('<InventoryGroupDetail />', () => {
   });
 
   describe('User has read-only permissions', () => {
-    jest.mock('react-router-dom', () => ({
-      ...jest.requireActual('react-router-dom'),
-      useParams: () => ({
-        id: 1,
-        groupId: 3,
-        inventoryType: 'inventory',
-      }),
-    }));
     test('should hide edit/delete buttons', async () => {
       const readOnlyGroup = {
         ...inventoryGroup,
@@ -175,48 +159,4 @@ describe('<InventoryGroupDetail />', () => {
       expect(wrapper.find('button[aria-label="Delete"]').length).toBe(0);
     });
   });
-  describe('Cannot edit or delete constructed inventory group', () => {
-    beforeEach(async () => {
-      await act(async () => {
-        history = createMemoryHistory({
-          initialEntries: ['/inventories/inventory/1/groups/1/details'],
-        });
-        wrapper = mountWithContexts(
-          <Route path="/inventories/inventory/:id/groups/:groupId">
-            <InventoryGroupDetail inventoryGroup={inventoryGroup} />
-          </Route>,
-          {
-            context: {
-              router: {
-                history,
-                route: {
-                  location: history.location,
-                  match: {
-                    params: {
-                      id: 1,
-                      group: 2,
-                      inventoryType: 'constructed_inventory',
-                    },
-                  },
-                },
-              },
-            },
-          }
-        );
-        await waitForElement(
-          wrapper,
-          'ContentLoading',
-          (el) => el.length === 0
-        );
-      });
-    });
-    afterEach(() => {
-      jest.clearAllMocks();
-    });
-    test('should not show edit button', () => {
-      const editButton = wrapper.find('Button[aria-label="edit"]');
-      expect(editButton.length).toBe(0);
-      expect(wrapper.find('Button[aria-label="delete"]').length).toBe(0);
-    });
-  });
 });

awx/ui/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostList.js

@@ -34,7 +34,7 @@ const QS_CONFIG = getQSConfig('host', {
 function InventoryGroupHostList() {
   const [isAdHocLaunchLoading, setIsAdHocLaunchLoading] = useState(false);
   const [isModalOpen, setIsModalOpen] = useState(false);
-  const { id: inventoryId, groupId, inventoryType } = useParams();
+  const { id: inventoryId, groupId } = useParams();
   const location = useLocation();
 
   const {
@@ -145,11 +145,9 @@ function InventoryGroupHostList() {
     useDismissableError(associateErr);
   const { error: disassociateError, dismissError: dismissDisassociateError } =
     useDismissableError(disassociateErr);
-  const isNotConstructedInventory = inventoryType !== 'constructed_inventory';
+
   const canAdd =
-    actions &&
+    actions && Object.prototype.hasOwnProperty.call(actions, 'POST');
-    Object.prototype.hasOwnProperty.call(actions, 'POST') &&
-    isNotConstructedInventory;
   const addFormUrl = `/inventories/inventory/${inventoryId}/groups/${groupId}/nested_hosts/add`;
   const addExistingHost = t`Add existing host`;
   const addNewHost = t`Add new host`;
@@ -242,21 +240,17 @@ function InventoryGroupHostList() {
                     />,
                   ]
                 : []),
-              ...(isNotConstructedInventory
+              <DisassociateButton
-                ? [
+                key="disassociate"
-                    <DisassociateButton
+                onDisassociate={handleDisassociate}
-                      key="disassociate"
+                itemsToDisassociate={selected}
-                      onDisassociate={handleDisassociate}
+                modalTitle={t`Disassociate host from group?`}
-                      itemsToDisassociate={selected}
+                modalNote={t`
-                      modalTitle={t`Disassociate host from group?`}
-                      modalNote={t`
                         Note that only hosts directly in this group can
                         be disassociated. Hosts in sub-groups must be disassociated
                         directly from the sub-group level that they belong.
                       `}
-                    />,
+              />,
-                  ]
-                : []),
             ]}
           />
         )}
@@ -265,8 +259,8 @@ function InventoryGroupHostList() {
             key={host.id}
             rowIndex={index}
             host={host}
-            detailUrl={`/inventories/${inventoryType}/${inventoryId}/hosts/${host.id}/details`}
+            detailUrl={`/inventories/inventory/${inventoryId}/hosts/${host.id}/details`}
-            editUrl={`/inventories/${inventoryType}/${inventoryId}/hosts/${host.id}/edit`}
+            editUrl={`/inventories/inventory/${inventoryId}/hosts/${host.id}/edit`}
             isSelected={selected.some((row) => row.id === host.id)}
             onSelect={() => handleSelect(host)}
           />

awx/ui/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostList.test.js

@@ -8,20 +8,19 @@ import {
 } from '../../../../testUtils/enzymeHelpers';
 import InventoryGroupHostList from './InventoryGroupHostList';
 import mockHosts from '../shared/data.hosts.json';
-import { Route } from 'react-router-dom';
 
 jest.mock('../../../api/models/Groups');
 jest.mock('../../../api/models/Inventories');
 jest.mock('../../../api/models/CredentialTypes');
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useParams: () => ({
+    id: 1,
+    groupId: 2,
+  }),
+}));
 
 describe('<InventoryGroupHostList />', () => {
-  jest.mock('react-router-dom', () => ({
-    ...jest.requireActual('react-router-dom'),
-    useParams: () => ({
-      id: 1,
-      groupId: 2,
-    }),
-  }));
   let wrapper;
 
   beforeEach(async () => {
@@ -304,64 +303,3 @@ describe('<InventoryGroupHostList />', () => {
     expect(wrapper.find('AdHocCommands')).toHaveLength(0);
   });
 });
-
-describe('<InventoryGroupHostList> for constructed inventories', () => {
-  jest.mock('react-router-dom', () => ({
-    ...jest.requireActual('react-router-dom'),
-    useParams: () => ({
-      id: 1,
-      groupId: 2,
-      inventoryType: 'constructed_inventory',
-    }),
-  }));
-  let wrapper;
-
-  beforeEach(async () => {
-    GroupsAPI.readAllHosts.mockResolvedValue({
-      data: { ...mockHosts },
-    });
-    InventoriesAPI.readHostsOptions.mockResolvedValue({
-      data: {
-        actions: {
-          GET: {},
-          POST: {},
-        },
-      },
-    });
-    InventoriesAPI.readAdHocOptions.mockResolvedValue({
-      data: {
-        actions: {
-          GET: {
-            module_name: {
-              choices: [
-                ['command', 'command'],
-                ['shell', 'shell'],
-              ],
-            },
-          },
-          POST: {},
-        },
-      },
-    });
-    const history = createMemoryHistory({
-      initialEntries: ['/inventories/constructed_inventory/1/groups/2/hosts'],
-    });
-    await act(async () => {
-      wrapper = mountWithContexts(
-        <Route path="/inventories/:inventoryType/:id/groups/:groupId/hosts">
-          <InventoryGroupHostList />
-        </Route>,
-        { context: { router: { history } } }
-      );
-    });
-    await waitForElement(wrapper, 'ContentLoading', (el) => el.length === 0);
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-  test('Should not show associate, or disassociate button', async () => {
-    expect(wrapper.find('AddDropDownButton').length).toBe(0);
-    expect(wrapper.find('DisassociateButton').length).toBe(0);
-  });
-});

awx/ui/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostListItem.js

@@ -1,6 +1,6 @@
 import 'styled-components/macro';
 import React from 'react';
-import { Link, useParams } from 'react-router-dom';
+import { Link } from 'react-router-dom';
 import { string, bool, func, number } from 'prop-types';
 import { t } from '@lingui/macro';
 import { Button, Tooltip } from '@patternfly/react-core';
@@ -24,7 +24,7 @@ function InventoryGroupHostListItem({
     ...job,
     type: 'job',
   }));
-  const { inventoryType } = useParams();
+
   const labelId = `check-action-${host.id}`;
 
   return (
@@ -57,24 +57,22 @@ function InventoryGroupHostListItem({
         >
           <HostToggle host={host} />
         </ActionItem>
-        {inventoryType !== 'constructed_inventory' && (
+        <ActionItem
-          <ActionItem
+          tooltip={t`Edit Host`}
-            tooltip={t`Edit Host`}
+          visible={host.summary_fields.user_capabilities?.edit}
-            visible={host.summary_fields.user_capabilities?.edit}
+        >
-          >
+          <Tooltip content={t`Edit Host`} position="top">
-            <Tooltip content={t`Edit Host`} position="top">
+            <Button
-              <Button
+              ouiaId={`${host.id}-edit-button`}
-                ouiaId={`${host.id}-edit-button`}
+              aria-label={t`Edit Host`}
-                aria-label={t`Edit Host`}
+              variant="plain"
-                variant="plain"
+              component={Link}
-                component={Link}
+              to={`${editUrl}`}
-                to={`${editUrl}`}
+            >
-              >
+              <PencilAltIcon />
-                <PencilAltIcon />
+            </Button>
-              </Button>
+          </Tooltip>
-            </Tooltip>
+        </ActionItem>
-          </ActionItem>
-        )}
       </ActionsTd>
     </Tr>
   );

awx/ui/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostListItem.test.js

@@ -1,35 +1,28 @@
 import React from 'react';
-import { createMemoryHistory } from 'history';
 import { mountWithContexts } from '../../../../testUtils/enzymeHelpers';
 import InventoryGroupHostListItem from './InventoryGroupHostListItem';
 import mockHosts from '../shared/data.hosts.json';
-import { Route } from 'react-router-dom';
 
 jest.mock('../../../api');
 
 describe('<InventoryGroupHostListItem />', () => {
   let wrapper;
   const mockHost = mockHosts.results[0];
-  const history = createMemoryHistory({
+
-    initialEntries: ['/inventories/inventory/1/groups/2/hosts'],
-  });
   beforeEach(() => {
     wrapper = mountWithContexts(
-      <Route path="/inventories/:inventoryType/:id/groups/:groupId/hosts">
+      <table>
-        <table>
+        <tbody>
-          <tbody>
+          <InventoryGroupHostListItem
-            <InventoryGroupHostListItem
+            detailUrl="/host/1"
-              detailUrl="/host/1"
+            editUrl="/host/1"
-              editUrl="/host/1"
+            host={mockHost}
-              host={mockHost}
+            isSelected={false}
-              isSelected={false}
+            onSelect={() => {}}
-              onSelect={() => {}}
+            rowIndex={0}
-              rowIndex={0}
+          />
-            />
+        </tbody>
-          </tbody>
+      </table>
-        </table>
-      </Route>,
-      { context: { router: { history } } }
     );
   });
 
@@ -59,60 +52,19 @@ describe('<InventoryGroupHostListItem />', () => {
     const copyMockHost = { ...mockHost };
     copyMockHost.summary_fields.user_capabilities.edit = false;
     wrapper = mountWithContexts(
-      <Route path="/inventories/:inventoryType/:id/groups/:groupId/hosts">
+      <table>
-        <table>
+        <tbody>
-          <tbody>
+          <InventoryGroupHostListItem
-            <InventoryGroupHostListItem
+            detailUrl="/host/1"
-              detailUrl="/host/1"
+            editUrl="/host/1"
-              editUrl="/host/1"
+            host={mockHost}
-              host={mockHost}
+            isSelected={false}
-              isSelected={false}
+            onSelect={() => {}}
-              onSelect={() => {}}
+            rowIndex={0}
-              rowIndex={0}
+          />
-            />
+        </tbody>
-          </tbody>
+      </table>
-        </table>
-      </Route>,
-      { context: { router: { history } } }
     );
     expect(wrapper.find('PencilAltIcon').exists()).toBeFalsy();
   });
 });
-
-describe('<InventoryGroupHostListItem> inside constructed inventories', () => {
-  jest.mock('react-router-dom', () => ({
-    ...jest.requireActual('react-router-dom'),
-    useParams: () => ({
-      id: 1,
-      groupId: 2,
-      inventoryType: 'constructed_inventory',
-    }),
-  }));
-  let wrapper;
-  const mockHost = mockHosts.results[0];
-  const history = createMemoryHistory({
-    initialEntries: ['/inventories/constructed_inventory/1/groups/2/hosts'],
-  });
-  beforeEach(() => {
-    wrapper = mountWithContexts(
-      <Route path="/inventories/:inventoryType/:id/groups/:groupId/hosts">
-        <table>
-          <tbody>
-            <InventoryGroupHostListItem
-              detailUrl="/host/1"
-              editUrl="/host/1"
-              host={mockHost}
-              isSelected={false}
-              onSelect={() => {}}
-              rowIndex={0}
-            />
-          </tbody>
-        </table>
-      </Route>,
-      { context: { router: { history } } }
-    );
-  });
-  test('Edit button hidden for constructed inventory', () => {
-    expect(wrapper.find('PencilAltIcon').exists()).toBeFalsy();
-  });
-});

awx/ui/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHosts.js

@@ -9,7 +9,7 @@ function InventoryGroupHosts({ inventoryGroup }) {
       <Route path="/inventories/inventory/:id/groups/:groupId/nested_hosts/add">
         <InventoryGroupHostAdd inventoryGroup={inventoryGroup} />
       </Route>
-      <Route path="/inventories/:inventoryType/:id/groups/:groupId/nested_hosts">
+      <Route path="/inventories/inventory/:id/groups/:groupId/nested_hosts">
         <InventoryGroupHostList />
       </Route>
     </Switch>

awx/ui/src/screens/Inventory/InventoryGroups/InventoryGroupItem.js

@@ -1,20 +1,25 @@
 import React from 'react';
-import { bool, func } from 'prop-types';
+import { bool, func, number, oneOfType, string } from 'prop-types';
 import { t } from '@lingui/macro';
 
 import { Button } from '@patternfly/react-core';
 import { Tr, Td } from '@patternfly/react-table';
 
-import { Link, useParams } from 'react-router-dom';
+import { Link } from 'react-router-dom';
 import { PencilAltIcon } from '@patternfly/react-icons';
 import { ActionsTd, ActionItem } from 'components/PaginatedTable';
 import { Group } from 'types';
 
-function InventoryGroupItem({ group, isSelected, onSelect, rowIndex }) {
+function InventoryGroupItem({
-  const { id: inventoryId, inventoryType } = useParams();
+  group,
+  inventoryId,
+  isSelected,
+  onSelect,
+  rowIndex,
+}) {
   const labelId = `check-action-${group.id}`;
-  const detailUrl = `/inventories/${inventoryType}/${inventoryId}/groups/${group.id}/details`;
+  const detailUrl = `/inventories/inventory/${inventoryId}/groups/${group.id}/details`;
-  const editUrl = `/inventories/${inventoryType}/${inventoryId}/groups/${group.id}/edit`;
+  const editUrl = `/inventories/inventory/${inventoryId}/groups/${group.id}/edit`;
 
   return (
     <Tr id={`group-row-${group.id}`} ouiaId={`group-row-${group.id}`}>
@@ -31,30 +36,29 @@ function InventoryGroupItem({ group, isSelected, onSelect, rowIndex }) {
           <b>{group.name}</b>
         </Link>
       </Td>
-      {inventoryType !== 'constructed_inventory' && (
+      <ActionsTd dataLabel={t`Actions`} gridColumns="auto 40px">
-        <ActionsTd dataLabel={t`Actions`} gridColumns="auto 40px">
+        <ActionItem
-          <ActionItem
+          visible={group.summary_fields.user_capabilities.edit}
-            visible={group.summary_fields.user_capabilities.edit}
+          tooltip={t`Edit group`}
-            tooltip={t`Edit group`}
+        >
+          <Button
+            ouiaId={`${group.id}-edit-button`}
+            aria-label={t`Edit Group`}
+            variant="plain"
+            component={Link}
+            to={editUrl}
           >
-            <Button
+            <PencilAltIcon />
-              ouiaId={`${group.id}-edit-button`}
+          </Button>
-              aria-label={t`Edit Group`}
+        </ActionItem>
-              variant="plain"
+      </ActionsTd>
-              component={Link}
-              to={editUrl}
-            >
-              <PencilAltIcon />
-            </Button>
-          </ActionItem>
-        </ActionsTd>
-      )}
     </Tr>
   );
 }
 
 InventoryGroupItem.propTypes = {
   group: Group.isRequired,
+  inventoryId: oneOfType([number, string]).isRequired,
   isSelected: bool.isRequired,
   onSelect: func.isRequired,
 };

awx/ui/src/screens/Inventory/InventoryGroups/InventoryGroupItem.test.js

@@ -1,6 +1,4 @@
 import React from 'react';
-import { Route } from 'react-router-dom';
-import { act } from 'react-dom/test-utils';
 import { mountWithContexts } from '../../../../testUtils/enzymeHelpers';
 import InventoryGroupItem from './InventoryGroupItem';
 
@@ -59,39 +57,4 @@ describe('<InventoryGroupItem />', () => {
     );
     expect(wrapper.find('PencilAltIcon').exists()).toBeFalsy();
   });
-  test('edit button should be hidden from constructed inventory group', async () => {
-    jest.mock('react-router-dom', () => ({
-      ...jest.requireActual('react-router-dom'),
-      useParams: () => ({ id: 42, inventoryType: 'constructed_inventory' }),
-    }));
-    const mockGroup = {
-      id: 2,
-      type: 'group',
-      name: 'foo',
-      inventory: 1,
-      summary_fields: {
-        user_capabilities: {
-          edit: true,
-        },
-      },
-    };
-
-    await act(async () => {
-      wrapper = mountWithContexts(
-        <Route path="/inventories/:inventoryType/:id/groups">
-          <table>
-            <tbody>
-              <InventoryGroupItem
-                group={mockGroup}
-                inventoryId={1}
-                isSelected={false}
-                onSelect={() => {}}
-              />
-            </tbody>
-          </table>
-        </Route>
-      );
-    });
-    expect(wrapper.find('PencilAltIcon').exists()).toBeFalsy();
-  });
 });

awx/ui/src/screens/Inventory/InventoryGroups/InventoryGroups.js

@@ -16,14 +16,11 @@ function InventoryGroups({ setBreadcrumb, inventory }) {
           inventory={inventory}
         />
       </Route>
-      <Route
+      <Route key="details" path="/inventories/inventory/:id/groups/:groupId/">
-        key="details"
-        path="/inventories/:inventoryType/:id/groups/:groupId/"
-      >
         <InventoryGroup inventory={inventory} setBreadcrumb={setBreadcrumb} />
       </Route>
-      <Route key="list" path="/inventories/:inventoryType/:id/groups">
+      <Route key="list" path="/inventories/inventory/:id/groups">
-        <InventoryGroupsList inventory={inventory} />
+        <InventoryGroupsList />
       </Route>
     </Switch>
   );

awx/ui/src/screens/Inventory/InventoryGroups/InventoryGroupsList.js

@@ -29,7 +29,7 @@ function cannotDelete(item) {
 
 function InventoryGroupsList() {
   const location = useLocation();
-  const { id: inventoryId, inventoryType } = useParams();
+  const { id: inventoryId } = useParams();
   const [isAdHocLaunchLoading, setIsAdHocLaunchLoading] = useState(false);
 
   const {
@@ -102,11 +102,9 @@ function InventoryGroupsList() {
     }
     return t`Select a row to delete`;
   };
-  const isNotConstructedInventory = inventoryType !== 'constructed_inventory';
+
   const canAdd =
-    actions &&
+    actions && Object.prototype.hasOwnProperty.call(actions, 'POST');
-    Object.prototype.hasOwnProperty.call(actions, 'POST') &&
-    isNotConstructedInventory;
 
   return (
     <PaginatedTable
@@ -141,13 +139,14 @@ function InventoryGroupsList() {
       headerRow={
         <HeaderRow qsConfig={QS_CONFIG}>
           <HeaderCell sortKey="name">{t`Name`}</HeaderCell>
-          {isNotConstructedInventory && <HeaderCell>{t`Actions`}</HeaderCell>}
+          <HeaderCell>{t`Actions`}</HeaderCell>
         </HeaderRow>
       }
       renderRow={(item, index) => (
         <InventoryGroupItem
           key={item.id}
           group={item}
+          inventoryId={inventoryId}
           isSelected={selected.some((row) => row.id === item.id)}
           onSelect={() => handleSelect(item)}
           rowIndex={index}
@@ -178,28 +177,20 @@ function InventoryGroupsList() {
                   />,
                 ]
               : []),
-            ...(isNotConstructedInventory
+            <Tooltip content={renderTooltip()} position="top" key="delete">
-              ? [
+              <div>
-                  <Tooltip
+                <InventoryGroupsDeleteModal
-                    content={renderTooltip()}
+                  groups={selected}
-                    position="top"
+                  isDisabled={
-                    key="delete"
+                    selected.length === 0 || selected.some(cannotDelete)
-                  >
+                  }
-                    <div>
+                  onAfterDelete={() => {
-                      <InventoryGroupsDeleteModal
+                    fetchData();
-                        groups={selected}
+                    clearSelected();
-                        isDisabled={
+                  }}
-                          selected.length === 0 || selected.some(cannotDelete)
+                />
-                        }
+              </div>
-                        onAfterDelete={() => {
+            </Tooltip>,
-                          fetchData();
-                          clearSelected();
-                        }}
-                      />
-                    </div>
-                  </Tooltip>,
-                ]
-              : []),
           ]}
         />
       )}

awx/ui/src/screens/Inventory/InventoryGroups/InventoryGroupsList.test.js

@@ -10,6 +10,12 @@ import {
 import InventoryGroupsList from './InventoryGroupsList';
 
 jest.mock('../../../api');
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useParams: () => ({
+    id: 1,
+  }),
+}));
 const mockGroups = [
   {
     id: 1,
@@ -54,14 +60,7 @@ const mockGroups = [
 
 describe('<InventoryGroupsList />', () => {
   let wrapper;
-  jest.mock('react-router-dom', () => ({
+
-    ...jest.requireActual('react-router-dom'),
-    useParams: () => ({
-      id: 1,
-      groupId: 2,
-      inventoryType: 'inventory',
-    }),
-  }));
   beforeEach(async () => {
     InventoriesAPI.readGroups.mockResolvedValue({
       data: {
@@ -97,7 +96,7 @@ describe('<InventoryGroupsList />', () => {
     });
     await act(async () => {
       wrapper = mountWithContexts(
-        <Route path="/inventories/:inventoryType/:id/groups">
+        <Route path="/inventories/inventory/:id/groups">
           <InventoryGroupsList />
         </Route>,
         {
@@ -317,77 +316,3 @@ describe('<InventoryGroupsList/> error handling', () => {
     });
   });
 });
-
-describe('Constructed Inventory group', () => {
-  let wrapper;
-  jest.mock('react-router-dom', () => ({
-    ...jest.requireActual('react-router-dom'),
-    useParams: () => ({
-      id: 1,
-      groupId: 2,
-      inventoryType: 'constructed_inventory',
-    }),
-  }));
-
-  beforeEach(async () => {
-    InventoriesAPI.readGroups.mockResolvedValue({
-      data: {
-        count: mockGroups.length,
-        results: mockGroups,
-      },
-    });
-    InventoriesAPI.readGroupsOptions.mockResolvedValue({
-      data: {
-        actions: {
-          GET: {},
-          POST: {},
-        },
-      },
-    });
-    InventoriesAPI.readAdHocOptions.mockResolvedValue({
-      data: {
-        actions: {
-          GET: {
-            module_name: {
-              choices: [
-                ['command', 'command'],
-                ['shell', 'shell'],
-              ],
-            },
-          },
-          POST: {},
-        },
-      },
-    });
-    const history = createMemoryHistory({
-      initialEntries: ['/inventories/constructed_inventory/3/groups'],
-    });
-    await act(async () => {
-      wrapper = mountWithContexts(
-        <Route path="/inventories/:inventoryType/:id/groups">
-          <InventoryGroupsList />
-        </Route>,
-        {
-          context: {
-            router: {
-              history,
-              route: {
-                location: history.location,
-              },
-            },
-          },
-        }
-      );
-    });
-    await waitForElement(wrapper, 'ContentLoading', (el) => el.length === 0);
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-  test('should not show add button', () => {
-    expect(wrapper.find('ToolbarAddButton').length).toBe(0);
-    expect(wrapper.find('ToolbarDeleteButton').length).toBe(0);
-    expect(wrapper.find('AdHocCommands').length).toBe(1);
-  });
-});

awx/ui/src/screens/Inventory/InventoryList/InventoryList.js

@@ -135,7 +135,6 @@ function InventoryList() {
 
   const addInventory = t`Add inventory`;
   const addSmartInventory = t`Add smart inventory`;
-  const addConstructedInventory = t`Add constructed inventory`;
   const addButton = (
     <AddDropDownButton
       ouiaId="add-inventory-button"
@@ -159,15 +158,6 @@ function InventoryList() {
         >
           {addSmartInventory}
         </DropdownItem>,
-        <DropdownItem
-          ouiaId="add-constructed-inventory-item"
-          to={`${match.url}/constructed_inventory/add/`}
-          component={Link}
-          key={addConstructedInventory}
-          aria-label={addConstructedInventory}
-        >
-          {addConstructedInventory}
-        </DropdownItem>,
       ]}
     />
   );
@@ -195,7 +185,6 @@ function InventoryList() {
                 options: [
                   ['', t`Inventory`],
                   ['smart', t`Smart Inventory`],
-                  ['constructed', t`Constructed Inventory`],
                 ],
               },
               {
@@ -272,6 +261,11 @@ function InventoryList() {
                 inventory={inventory}
                 rowIndex={index}
                 fetchInventories={fetchInventories}
+                detailUrl={
+                  inventory.kind === 'smart'
+                    ? `${match.url}/smart_inventory/${inventory.id}/details`
+                    : `${match.url}/inventory/${inventory.id}/details`
+                }
                 onSelect={() => {
                   if (!inventory.pending_deletion) {
                     handleSelect(inventory);

awx/ui/src/screens/Inventory/InventoryList/InventoryListItem.js

@@ -1,5 +1,5 @@
 import React, { useState, useCallback } from 'react';
-import { bool, func } from 'prop-types';
+import { string, bool, func } from 'prop-types';
 
 import { Button, Label } from '@patternfly/react-core';
 import { Tr, Td } from '@patternfly/react-table';
@@ -12,7 +12,6 @@ import { Inventory } from 'types';
 import { ActionsTd, ActionItem, TdBreakWord } from 'components/PaginatedTable';
 import CopyButton from 'components/CopyButton';
 import StatusLabel from 'components/StatusLabel';
-import { getInventoryPath } from '../shared/utils';
 
 function InventoryListItem({
   inventory,
@@ -20,10 +19,12 @@ function InventoryListItem({
   isSelected,
   onSelect,
   onCopy,
+  detailUrl,
   fetchInventories,
 }) {
   InventoryListItem.propTypes = {
     inventory: Inventory.isRequired,
+    detailUrl: string.isRequired,
     isSelected: bool.isRequired,
     onSelect: func.isRequired,
   };
@@ -49,12 +50,6 @@ function InventoryListItem({
 
   const labelId = `check-action-${inventory.id}`;
 
-  const typeLabel = {
-    '': t`Inventory`,
-    smart: t`Smart Inventory`,
-    constructed: t`Constructed Inventory`,
-  };
-
   let syncStatus = 'disabled';
   if (inventory.isSourceSyncRunning) {
     syncStatus = 'syncing';
@@ -98,20 +93,16 @@ function InventoryListItem({
         {inventory.pending_deletion ? (
           <b>{inventory.name}</b>
         ) : (
-          <Link to={`${getInventoryPath(inventory)}/details`}>
+          <Link to={`${detailUrl}`}>
             <b>{inventory.name}</b>
           </Link>
         )}
       </TdBreakWord>
       <Td dataLabel={t`Status`}>
-        {inventory.kind === '' &&
+        {inventory.kind !== 'smart' &&
           (inventory.has_inventory_sources ? (
             <Link
-              to={`${getInventoryPath(
+              to={`/inventories/inventory/${inventory.id}/jobs?job.or__inventoryupdate__inventory_source__inventory__id=${inventory.id}`}
-                inventory
-              )}/jobs?job.or__inventoryupdate__inventory_source__inventory__id=${
-                inventory.id
-              }`}
             >
               <StatusLabel
                 status={syncStatus}
@@ -122,7 +113,9 @@ function InventoryListItem({
             <StatusLabel status={syncStatus} tooltipContent={tooltipContent} />
           ))}
       </Td>
-      <Td dataLabel={t`Type`}>{typeLabel[inventory.kind]}</Td>
+      <Td dataLabel={t`Type`}>
+        {inventory.kind === 'smart' ? t`Smart Inventory` : t`Inventory`}
+      </Td>
       <TdBreakWord key="organization" dataLabel={t`Organization`}>
         <Link
           to={`/organizations/${inventory?.summary_fields?.organization?.id}/details`}
@@ -146,7 +139,9 @@ function InventoryListItem({
               aria-label={t`Edit Inventory`}
               variant="plain"
               component={Link}
-              to={`${getInventoryPath(inventory)}edit`}
+              to={`/inventories/${
+                inventory.kind === 'smart' ? 'smart_inventory' : 'inventory'
+              }/${inventory.id}/edit`}
             >
               <PencilAltIcon />
             </Button>

awx/ui/src/screens/Inventory/InventoryRelatedGroups/InventoryRelatedGroupList.js

@@ -33,7 +33,7 @@ function InventoryRelatedGroupList() {
   const [isAdHocLaunchLoading, setIsAdHocLaunchLoading] = useState(false);
   const [associateError, setAssociateError] = useState(null);
   const [disassociateError, setDisassociateError] = useState(null);
-  const { id: inventoryId, groupId, inventoryType } = useParams();
+  const { id: inventoryId, groupId } = useParams();
   const location = useLocation();
 
   const {
@@ -69,10 +69,9 @@ function InventoryRelatedGroupList() {
         searchableKeys: getSearchableKeys(actions.data.actions?.GET),
         canAdd:
           actions.data.actions &&
-          Object.prototype.hasOwnProperty.call(actions.data.actions, 'POST') &&
+          Object.prototype.hasOwnProperty.call(actions.data.actions, 'POST'),
-          inventoryType !== 'constructed_inventory',
       };
-    }, [groupId, location.search, inventoryType, inventoryId]),
+    }, [groupId, location.search, inventoryId]),
     {
       groups: [],
       itemCount: 0,
@@ -165,7 +164,7 @@ function InventoryRelatedGroupList() {
       ]}
     />
   );
-  const isNotConstructedInventory = inventoryType !== 'constructed_inventory';
+
   return (
     <>
       <PaginatedTable
@@ -219,23 +218,19 @@ function InventoryRelatedGroupList() {
                     />,
                   ]
                 : []),
-              ...(isNotConstructedInventory
+              <DisassociateButton
-                ? [
+                key="disassociate"
-                    <DisassociateButton
+                onDisassociate={disassociateGroups}
-                      key="disassociate"
+                itemsToDisassociate={selected}
-                      onDisassociate={disassociateGroups}
+                modalTitle={t`Disassociate related group(s)?`}
-                      itemsToDisassociate={selected}
+              />,
-                      modalTitle={t`Disassociate related group(s)?`}
-                    />,
-                  ]
-                : []),
             ]}
           />
         )}
         headerRow={
           <HeaderRow qsConfig={QS_CONFIG}>
             <HeaderCell sortKey="name">{t`Name`}</HeaderCell>
-            {isNotConstructedInventory && <HeaderCell>{t`Actions`}</HeaderCell>}
+            <HeaderCell>{t`Actions`}</HeaderCell>
           </HeaderRow>
         }
         renderRow={(group, index) => (

awx/ui/src/screens/Inventory/InventoryRelatedGroups/InventoryRelatedGroupList.test.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import { act } from 'react-dom/test-utils';
-import { createMemoryHistory } from 'history';
+
-import { Route } from 'react-router-dom';
 import { GroupsAPI, InventoriesAPI } from 'api';
 import {
   mountWithContexts,
@@ -14,6 +13,14 @@ jest.mock('../../../api/models/Groups');
 jest.mock('../../../api/models/Inventories');
 jest.mock('../../../api/models/CredentialTypes');
 
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useParams: () => ({
+    id: 1,
+    groupId: 2,
+  }),
+}));
+
 const mockGroups = [
   {
     id: 1,
@@ -58,14 +65,6 @@ const mockGroups = [
 
 describe('<InventoryRelatedGroupList />', () => {
   let wrapper;
-  jest.mock('react-router-dom', () => ({
-    ...jest.requireActual('react-router-dom'),
-    useParams: () => ({
-      id: 2,
-      groupId: 2,
-      inventoryType: 'inventory',
-    }),
-  }));
 
   beforeEach(async () => {
     GroupsAPI.readChildren.mockResolvedValue({
@@ -211,22 +210,11 @@ describe('<InventoryRelatedGroupList />', () => {
     GroupsAPI.readPotentialGroups.mockResolvedValue({
       data: { count: mockGroups.length, results: mockGroups },
     });
-    const history = createMemoryHistory({
-      initialEntries: ['/inventories/inventory/2/groups/2/nested_groups'],
-    });
     await act(async () => {
-      wrapper = mountWithContexts(
+      wrapper = mountWithContexts(<InventoryRelatedGroupList />);
-        <Route path="/inventories/:inventoryType/:id/groups/:groupId/nested_groups">
-          <InventoryRelatedGroupList />
-        </Route>,
-        { context: { router: { history } } }
-      );
     });
-    await waitForElement(
+    await waitForElement(wrapper, 'ContentLoading', (el) => el.length === 0);
-      wrapper,
+
-      'InventoryRelatedGroupList',
-      (el) => el.length > 0
-    );
     act(() => wrapper.find('Button[aria-label="Add"]').prop('onClick')());
     wrapper.update();
     await act(async () =>
@@ -234,9 +222,9 @@ describe('<InventoryRelatedGroupList />', () => {
         .find('DropdownItem[aria-label="Add existing group"]')
         .prop('onClick')()
     );
-    expect(GroupsAPI.readPotentialGroups).toBeCalledWith('2', {
+    expect(GroupsAPI.readPotentialGroups).toBeCalledWith(2, {
-      not__id: '2',
+      not__id: 2,
-      not__parents: '2',
+      not__parents: 2,
       order_by: 'name',
       page: 1,
       page_size: 5,
@@ -273,85 +261,3 @@ describe('<InventoryRelatedGroupList />', () => {
     expect(wrapper.find('AdHocCommands')).toHaveLength(0);
   });
 });
-
-describe('<InventoryRelatedGroupList> for constructed inventories', () => {
-  jest.mock('react-router-dom', () => ({
-    ...jest.requireActual('react-router-dom'),
-    useParams: () => ({
-      id: 1,
-      groupId: 2,
-      inventoryType: 'constructed_inventory',
-    }),
-  }));
-  let wrapper;
-
-  beforeEach(async () => {
-    GroupsAPI.readChildren.mockResolvedValue({
-      data: { ...mockRelatedGroups },
-    });
-    InventoriesAPI.readGroupsOptions.mockResolvedValue({
-      data: {
-        actions: {
-          GET: {},
-          POST: {},
-        },
-        related_search_fields: [
-          'parents__search',
-          'inventory__search',
-          'inventory_sources__search',
-          'created_by__search',
-          'children__search',
-          'modified_by__search',
-          'hosts__search',
-        ],
-      },
-    });
-    InventoriesAPI.readAdHocOptions.mockResolvedValue({
-      data: {
-        actions: {
-          GET: {
-            module_name: {
-              choices: [
-                ['command', 'command'],
-                ['shell', 'shell'],
-              ],
-            },
-          },
-          POST: {},
-        },
-      },
-    });
-    const history = createMemoryHistory({
-      initialEntries: [
-        '/inventories/constructed_inventory/1/groups/2/nested_groupss',
-      ],
-    });
-    await act(async () => {
-      wrapper = mountWithContexts(
-        <Route path="/inventories/:inventoryType/:id/groups/:groupId/nested_groups">
-          <InventoryRelatedGroupList />
-        </Route>,
-        { context: { router: { history } } }
-      );
-    });
-    await waitForElement(wrapper, 'ContentLoading', (el) => el.length === 0);
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  test('Should not show associate, or disassociate button', async () => {
-    InventoriesAPI.readHostsOptions.mockResolvedValueOnce({
-      data: {
-        actions: {
-          GET: {},
-        },
-      },
-    });
-
-    await waitForElement(wrapper, 'ContentLoading', (el) => el.length === 0);
-    expect(wrapper.find('AddDropDownButton').length).toBe(0);
-    expect(wrapper.find('DisassociateButton').length).toBe(0);
-  });
-});

awx/ui/src/screens/Inventory/InventoryRelatedGroups/InventoryRelatedGroupListItem.js

@@ -1,6 +1,6 @@
 import 'styled-components/macro';
 import React from 'react';
-import { Link, useParams } from 'react-router-dom';
+import { Link } from 'react-router-dom';
 import { string, bool, func, number } from 'prop-types';
 
 import { t } from '@lingui/macro';
@@ -21,7 +21,7 @@ function InventoryRelatedGroupListItem({
   onSelect,
 }) {
   const labelId = `check-action-${group.id}`;
-  const { inventoryType } = useParams();
+
   return (
     <Tr
       id={group.id}
@@ -41,24 +41,22 @@ function InventoryRelatedGroupListItem({
           <b>{group.name}</b>
         </Link>
       </Td>
-      {inventoryType !== 'constructed_inventory' && (
+      <ActionsTd dataLabel={t`Actions`}>
-        <ActionsTd dataLabel={t`Actions`}>
+        <ActionItem
-          <ActionItem
+          tooltip={t`Edit Group`}
-            tooltip={t`Edit Group`}
+          visible={group.summary_fields.user_capabilities?.edit}
-            visible={group.summary_fields.user_capabilities?.edit}
+        >
+          <Button
+            ouiaId={`${group.id}-edit-button`}
+            aria-label={t`Edit Group`}
+            variant="plain"
+            component={Link}
+            to={`${editUrl}`}
           >
-            <Button
+            <PencilAltIcon />
-              ouiaId={`${group.id}-edit-button`}
+          </Button>
-              aria-label={t`Edit Group`}
+        </ActionItem>
-              variant="plain"
+      </ActionsTd>
-              component={Link}
-              to={`${editUrl}`}
-            >
-              <PencilAltIcon />
-            </Button>
-          </ActionItem>
-        </ActionsTd>
-      )}
     </Tr>
   );
 }

awx/ui/src/screens/Inventory/InventoryRelatedGroups/InventoryRelatedGroupListItem.test.js

@@ -1,43 +1,28 @@
 import React from 'react';
-import { createMemoryHistory } from 'history';
 import { mountWithContexts } from '../../../../testUtils/enzymeHelpers';
 import InventoryRelatedGroupListItem from './InventoryRelatedGroupListItem';
 import mockRelatedGroups from '../shared/data.relatedGroups.json';
-import { Route } from 'react-router-dom';
 
 jest.mock('../../../api');
 
-const mockGroup = mockRelatedGroups.results[0];
 describe('<InventoryRelatedGroupListItem />', () => {
   let wrapper;
-  const history = createMemoryHistory({
+  const mockGroup = mockRelatedGroups.results[0];
-    initialEntries: ['/inventories/inventory/1/groups/2/nested_groups'],
+
-  });
-  jest.mock('react-router-dom', () => ({
-    ...jest.requireActual('react-router-dom'),
-    useParams: () => ({
-      id: 1,
-      groupId: 2,
-      inventoryType: 'inventory',
-    }),
-  }));
   beforeEach(() => {
     wrapper = mountWithContexts(
-      <Route path="/inventories/:inventoryType/:id/groups/:groupId/nested_groups">
+      <table>
-        <table>
+        <tbody>
-          <tbody>
+          <InventoryRelatedGroupListItem
-            <InventoryRelatedGroupListItem
+            detailUrl="/group/1"
-              detailUrl="/group/1"
+            editUrl="/group/1"
-              editUrl="/group/1"
+            group={mockGroup}
-              group={mockGroup}
+            isSelected={false}
-              isSelected={false}
+            onSelect={() => {}}
-              onSelect={() => {}}
+            rowIndex={0}
-              rowIndex={0}
+          />
-            />
+        </tbody>
-          </tbody>
+      </table>
-        </table>
-      </Route>,
-      { context: { router: { history } } }
     );
   });
 
@@ -51,60 +36,18 @@ describe('<InventoryRelatedGroupListItem />', () => {
 
   test('edit button hidden from users without edit capabilities', () => {
     wrapper = mountWithContexts(
-      <Route path="/inventories/:inventoryType/:id/groups/:groupId/nested_groups">
+      <table>
-        <table>
+        <tbody>
-          <tbody>
+          <InventoryRelatedGroupListItem
-            <InventoryRelatedGroupListItem
+            detailUrl="/group/1"
-              detailUrl="/group/1"
+            editUrl="/group/1"
-              editUrl="/group/1"
+            group={mockRelatedGroups.results[2]}
-              group={mockRelatedGroups.results[2]}
+            isSelected={false}
-              isSelected={false}
+            onSelect={() => {}}
-              onSelect={() => {}}
+            rowIndex={0}
-              rowIndex={0}
+          />
-            />
+        </tbody>
-          </tbody>
+      </table>
-        </table>
-      </Route>,
-      { context: { router: { history } } }
-    );
-    expect(wrapper.find('PencilAltIcon').exists()).toBeFalsy();
-  });
-});
-
-describe('<InventoryRelatedGroupList> for constructed inventories', () => {
-  jest.mock('react-router-dom', () => ({
-    ...jest.requireActual('react-router-dom'),
-    useParams: () => ({
-      id: 1,
-      groupId: 2,
-      inventoryType: 'constructed_inventory',
-    }),
-  }));
-
-  let wrapper;
-
-  test('edit button hidden from users without edit capabilities', () => {
-    const history = createMemoryHistory({
-      initialEntries: [
-        '/inventories/constructed_inventory/1/groups/2/nested_groups',
-      ],
-    });
-    wrapper = mountWithContexts(
-      <Route path="/inventories/:inventoryType/:id/groups/:groupId/nested_groups">
-        <table>
-          <tbody>
-            <InventoryRelatedGroupListItem
-              detailUrl="/group/1"
-              editUrl="/group/1"
-              group={mockGroup}
-              isSelected={false}
-              onSelect={() => {}}
-              rowIndex={0}
-            />
-          </tbody>
-        </table>
-      </Route>,
-      { context: { router: { history } } }
     );
     expect(wrapper.find('PencilAltIcon').exists()).toBeFalsy();
   });

awx/ui/src/screens/Inventory/InventoryRelatedGroups/InventoryRelatedGroups.js

@@ -8,13 +8,13 @@ function InventoryRelatedGroups() {
     <Switch>
       <Route
         key="addRelatedGroups"
-        path="/inventories/:inventoryType/:id/groups/:groupId/nested_groups/add"
+        path="/inventories/inventory/:id/groups/:groupId/nested_groups/add"
       >
         <InventoryRelatedGroupAdd />
       </Route>
       <Route
         key="relatedGroups"
-        path="/inventories/:inventoryType/:id/groups/:groupId/nested_groups"
+        path="/inventories/inventory/:id/groups/:groupId/nested_groups"
       >
         <InventoryRelatedGroupList />
       </Route>

awx/ui/src/screens/Inventory/InventorySourceDetail/InventorySourceDetail.js

@@ -31,7 +31,7 @@ import { formatDateString } from 'util/dates';
 import Popover from 'components/Popover';
 import { VERBOSITY } from 'components/VerbositySelectField';
 import InventorySourceSyncButton from '../shared/InventorySourceSyncButton';
-import useWsInventorySourcesDetails from '../shared/useWsInventorySourcesDetails';
+import useWsInventorySourcesDetails from '../InventorySources/useWsInventorySourcesDetails';
 import getHelpText from '../shared/Inventory.helptext';
 
 function InventorySourceDetail({ inventorySource }) {

awx/ui/src/screens/Inventory/InventorySources/useWsInventorySourcesDetails.js

@@ -0,0 +1,42 @@
+import { useState, useEffect } from 'react';
+import useWebsocket from 'hooks/useWebsocket';
+
+export default function useWsInventorySourcesDetails(initialSources) {
+  const [sources, setSources] = useState(initialSources);
+  const lastMessage = useWebsocket({
+    jobs: ['status_changed'],
+    control: ['limit_reached_1'],
+  });
+
+  useEffect(() => {
+    setSources(initialSources);
+  }, [initialSources]);
+
+  useEffect(
+    () => {
+      if (
+        !lastMessage?.unified_job_id ||
+        !lastMessage?.inventory_source_id ||
+        lastMessage.type !== 'inventory_update'
+      ) {
+        return;
+      }
+      const updateSource = {
+        ...sources,
+        summary_fields: {
+          ...sources.summary_fields,
+          current_job: {
+            id: lastMessage.unified_job_id,
+            status: lastMessage.status,
+            finished: lastMessage.finished,
+          },
+        },
+      };
+
+      setSources(updateSource);
+    },
+    [lastMessage] // eslint-disable-line react-hooks/exhaustive-deps
+  );
+
+  return sources;
+}

awx/ui/src/screens/Inventory/InventorySources/useWsInventorySourcesDetails.test.js

@@ -1,12 +1,9 @@
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import WS from 'jest-websocket-mock';
-import { InventorySourcesAPI } from 'api';
 import { mountWithContexts } from '../../../../testUtils/enzymeHelpers';
 import useWsInventorySourceDetails from './useWsInventorySourcesDetails';
 
-jest.mock('../../../api/models/InventorySources');
-
 function TestInner() {
   return <div />;
 }
@@ -114,27 +111,6 @@ describe('useWsProject', () => {
       status: 'running',
       finished: null,
     });
-
-    expect(InventorySourcesAPI.readDetail).toHaveBeenCalledTimes(0);
-    InventorySourcesAPI.readDetail.mockResolvedValue({
-      data: {},
-    });
-    await act(async () => {
-      mockServer.send(
-        JSON.stringify({
-          group_name: 'jobs',
-          inventory_id: 1,
-          status: 'successful',
-          type: 'inventory_update',
-          unified_job_id: 2,
-          unified_job_template_id: 1,
-          inventory_source_id: 1,
-        })
-      );
-    });
-    expect(InventorySourcesAPI.readDetail).toHaveBeenCalledTimes(1);
-
-    jest.clearAllMocks();
     WS.clean();
   });
 });

awx/ui/src/screens/Inventory/SmartInventory.js

@@ -22,8 +22,7 @@ import RoutedTabs from 'components/RoutedTabs';
 import RelatedTemplateList from 'components/RelatedTemplateList';
 import SmartInventoryDetail from './SmartInventoryDetail';
 import SmartInventoryEdit from './SmartInventoryEdit';
-import AdvancedInventoryHosts from './AdvancedInventoryHosts';
+import SmartInventoryHosts from './SmartInventoryHosts';
-import { getInventoryPath } from './shared/utils';
 
 function SmartInventory({ setBreadcrumb }) {
   const location = useLocation();
@@ -102,8 +101,8 @@ function SmartInventory({ setBreadcrumb }) {
     );
   }
 
-  if (inventory && inventory?.kind !== 'smart') {
+  if (inventory?.kind === '') {
-    return <Redirect to={`${getInventoryPath(inventory)}/details`} />;
+    return <Redirect to={`/inventories/inventory/${inventory.id}/details`} />;
   }
 
   let showCardHeader = true;
@@ -142,7 +141,7 @@ function SmartInventory({ setBreadcrumb }) {
               />
             </Route>,
             <Route key="hosts" path="/inventories/smart_inventory/:id/hosts">
-              <AdvancedInventoryHosts
+              <SmartInventoryHosts
                 inventory={inventory}
                 setBreadcrumb={setBreadcrumb}
               />

awx/ui/src/screens/Inventory/SmartInventoryHost/SmartInventoryHost.js

@@ -8,11 +8,11 @@ import ContentLoading from 'components/ContentLoading';
 import RoutedTabs from 'components/RoutedTabs';
 import useRequest from 'hooks/useRequest';
 import { InventoriesAPI } from 'api';
-import AdvancedInventoryHostDetail from '../AdvancedInventoryHostDetail';
+import SmartInventoryHostDetail from '../SmartInventoryHostDetail';
 
-function AdvancedInventoryHost({ inventory, setBreadcrumb }) {
+function SmartInventoryHost({ inventory, setBreadcrumb }) {
   const { params, path, url } = useRouteMatch(
-    '/inventories/:inventoryType/:id/hosts/:hostId'
+    '/inventories/smart_inventory/:id/hosts/:hostId'
   );
 
   const {
@@ -28,7 +28,7 @@ function AdvancedInventoryHost({ inventory, setBreadcrumb }) {
       );
       return response;
     }, [inventory.id, params.hostId]),
-    { isLoading: true }
+    null
   );
 
   useEffect(() => {
@@ -44,6 +44,7 @@ function AdvancedInventoryHost({ inventory, setBreadcrumb }) {
   if (error) {
     return <ContentError error={error} />;
   }
+
   const tabsArray = [
     {
       name: (
@@ -52,7 +53,7 @@ function AdvancedInventoryHost({ inventory, setBreadcrumb }) {
           {t`Back to Hosts`}
         </>
       ),
-      link: `/inventories/${params.inventoryType}/${inventory.id}/hosts`,
+      link: `/inventories/smart_inventory/${inventory.id}/hosts`,
       id: 0,
     },
     {
@@ -71,19 +72,17 @@ function AdvancedInventoryHost({ inventory, setBreadcrumb }) {
       {!isLoading && host && (
         <Switch>
           <Redirect
-            from="/inventories/:inventoryType/:id/hosts/:hostId"
+            from="/inventories/smart_inventory/:id/hosts/:hostId"
             to={`${path}/details`}
             exact
           />
           <Route key="details" path={`${path}/details`}>
-            <AdvancedInventoryHostDetail host={host} />
+            <SmartInventoryHostDetail host={host} />
           </Route>
           <Route key="not-found" path="*">
             <ContentError isNotFound>
               <Link to={`${url}/details`}>
-                {params.inventoryType === 'smart_inventory'
+                {t`View smart inventory host details`}
-                  ? t`View smart inventory host details`
-                  : t`View constructed inventory host details`}
               </Link>
             </ContentError>
           </Route>
@@ -93,4 +92,4 @@ function AdvancedInventoryHost({ inventory, setBreadcrumb }) {
   );
 }
 
-export default AdvancedInventoryHost;
+export default SmartInventoryHost;

awx/ui/src/screens/Inventory/SmartInventoryHost/SmartInventoryHost.test.js

@@ -7,14 +7,14 @@ import {
   waitForElement,
 } from '../../../../testUtils/enzymeHelpers';
 import mockHost from '../shared/data.host.json';
-import AdvancedInventoryHost from './AdvancedInventoryHost';
+import SmartInventoryHost from './SmartInventoryHost';
 
 jest.mock('../../../api');
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
   useRouteMatch: () => ({
     params: { id: 1234, hostId: 2 },
-    path: '/inventories/:inventoryType/:id/hosts/:hostId',
+    path: '/inventories/smart_inventory/:id/hosts/:hostId',
     url: '/inventories/smart_inventory/1234/hosts/2',
   }),
 }));
@@ -24,7 +24,7 @@ const mockSmartInventory = {
   name: 'Mock Smart Inventory',
 };
 
-describe('<AdvancedInventoryHost />', () => {
+describe('<SmartInventoryHost />', () => {
   let wrapper;
   let history;
 
@@ -36,7 +36,7 @@ describe('<AdvancedInventoryHost />', () => {
     InventoriesAPI.readHostDetail.mockResolvedValue(mockHost);
     await act(async () => {
       wrapper = mountWithContexts(
-        <AdvancedInventoryHost
+        <SmartInventoryHost
           inventory={mockSmartInventory}
           setBreadcrumb={() => {}}
         />
@@ -55,7 +55,7 @@ describe('<AdvancedInventoryHost />', () => {
     InventoriesAPI.readHostDetail.mockRejectedValueOnce(new Error());
     await act(async () => {
       wrapper = mountWithContexts(
-        <AdvancedInventoryHost
+        <SmartInventoryHost
           inventory={mockSmartInventory}
           setBreadcrumb={() => {}}
         />
@@ -76,7 +76,7 @@ describe('<AdvancedInventoryHost />', () => {
     });
     await act(async () => {
       wrapper = mountWithContexts(
-        <AdvancedInventoryHost
+        <SmartInventoryHost
           inventory={mockSmartInventory}
           setBreadcrumb={() => {}}
         />,

awx/ui/src/screens/Inventory/SmartInventoryHost/index.js

@@ -0,0 +1 @@
+export { default } from './SmartInventoryHost';

awx/ui/src/screens/Inventory/SmartInventoryHostDetail/SmartInventoryHostDetail.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Link, useParams } from 'react-router-dom';
+import { Link } from 'react-router-dom';
 
 import { t } from '@lingui/macro';
 import { Host } from 'types';
@@ -8,8 +8,7 @@ import { Detail, DetailList, UserDateDetail } from 'components/DetailList';
 import Sparkline from 'components/Sparkline';
 import { VariablesDetail } from 'components/CodeEditor';
 
-function AdvancedInventoryHostDetail({ host }) {
+function SmartInventoryHostDetail({ host }) {
-  const { inventoryType } = useParams();
   const {
     created,
     description,
@@ -25,7 +24,6 @@ function AdvancedInventoryHostDetail({ host }) {
     type: 'job',
   }));
 
-  const inventoryKind = inventory.kind === '' ? 'inventory' : inventoryType;
   return (
     <CardBody>
       <DetailList gutter="sm">
@@ -39,7 +37,7 @@ function AdvancedInventoryHostDetail({ host }) {
         <Detail
           label={t`Inventory`}
           value={
-            <Link to={`/inventories/${inventoryKind}/${inventory?.id}/details`}>
+            <Link to={`/inventories/inventory/${inventory?.id}/details`}>
               {inventory?.name}
             </Link>
           }
@@ -63,8 +61,8 @@ function AdvancedInventoryHostDetail({ host }) {
   );
 }
 
-AdvancedInventoryHostDetail.propTypes = {
+SmartInventoryHostDetail.propTypes = {
   host: Host.isRequired,
 };
 
-export default AdvancedInventoryHostDetail;
+export default SmartInventoryHostDetail;

awx/ui/src/screens/Inventory/SmartInventoryHostDetail/SmartInventoryHostDetail.test.js

@@ -1,17 +1,15 @@
 import React from 'react';
 import { mountWithContexts } from '../../../../testUtils/enzymeHelpers';
-import AdvancedInventoryHostDetail from './AdvancedInventoryHostDetail';
+import SmartInventoryHostDetail from './SmartInventoryHostDetail';
 import mockHost from '../shared/data.host.json';
 
 jest.mock('../../../api');
 
-describe('<AdvancedInventoryHostDetail />', () => {
+describe('<SmartInventoryHostDetail />', () => {
   let wrapper;
 
   beforeAll(() => {
-    wrapper = mountWithContexts(
+    wrapper = mountWithContexts(<SmartInventoryHostDetail host={mockHost} />);
-      <AdvancedInventoryHostDetail host={mockHost} />
-    );
   });
 
   test('should render Details', () => {
@@ -32,12 +30,11 @@ describe('<AdvancedInventoryHostDetail />', () => {
 
   test('should not load Activity', () => {
     wrapper = mountWithContexts(
-      <AdvancedInventoryHostDetail
+      <SmartInventoryHostDetail
         host={{
           ...mockHost,
           summary_fields: {
             recent_jobs: [],
-            inventory: { kind: 'constructed', id: 2 },
           },
         }}
       />

awx/ui/src/screens/Inventory/SmartInventoryHostDetail/index.js

@@ -0,0 +1 @@
+export { default } from './SmartInventoryHostDetail';

awx/ui/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostList.js

@@ -13,7 +13,7 @@ import { getQSConfig, parseQueryString } from 'util/qs';
 import { InventoriesAPI } from 'api';
 import { Inventory } from 'types';
 import AdHocCommands from 'components/AdHocCommands/AdHocCommands';
-import AdvancedInventoryHostListItem from './AdvancedInventoryHostListItem';
+import SmartInventoryHostListItem from './SmartInventoryHostListItem';
 
 const QS_CONFIG = getQSConfig('host', {
   page: 1,
@@ -21,7 +21,7 @@ const QS_CONFIG = getQSConfig('host', {
   order_by: 'name',
 });
 
-function AdvancedInventoryHostList({ inventory }) {
+function SmartInventoryHostList({ inventory }) {
   const location = useLocation();
   const [isAdHocLaunchLoading, setIsAdHocLaunchLoading] = useState(false);
   const {
@@ -61,10 +61,7 @@ function AdvancedInventoryHostList({ inventory }) {
   useEffect(() => {
     fetchHosts();
   }, [fetchHosts]);
-  const inventoryType =
+
-    inventory.kind === 'constructed'
-      ? 'constructed_inventory'
-      : 'smart_inventory';
   return (
     <PaginatedTable
       contentError={contentError}
@@ -117,11 +114,10 @@ function AdvancedInventoryHostList({ inventory }) {
         </HeaderRow>
       }
       renderRow={(host, index) => (
-        <AdvancedInventoryHostListItem
+        <SmartInventoryHostListItem
           key={host.id}
           host={host}
-          inventoryType={inventoryType}
+          detailUrl={`/inventories/smart_inventory/${inventory.id}/hosts/${host.id}/details`}
-          detailUrl={`/inventories/${inventoryType}/${inventory.id}/hosts/${host.id}/details`}
           isSelected={selected.some((row) => row.id === host.id)}
           onSelect={() => handleSelect(host)}
           rowIndex={index}
@@ -131,8 +127,8 @@ function AdvancedInventoryHostList({ inventory }) {
   );
 }
 
-AdvancedInventoryHostList.propTypes = {
+SmartInventoryHostList.propTypes = {
   inventory: Inventory.isRequired,
 };
 
-export default AdvancedInventoryHostList;
+export default SmartInventoryHostList;

awx/ui/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostList.test.js

@@ -5,13 +5,13 @@ import {
   mountWithContexts,
   waitForElement,
 } from '../../../../testUtils/enzymeHelpers';
-import AdvancedInventoryHostList from './AdvancedInventoryHostList';
+import SmartInventoryHostList from './SmartInventoryHostList';
 import mockInventory from '../shared/data.inventory.json';
 import mockHosts from '../shared/data.hosts.json';
 
 jest.mock('../../../api');
 
-describe('<AdvancedInventoryHostList />', () => {
+describe('<SmartInventoryHostList />', () => {
   let wrapper;
   const clonedInventory = {
     ...mockInventory,
@@ -44,7 +44,7 @@ describe('<AdvancedInventoryHostList />', () => {
     });
     await act(async () => {
       wrapper = mountWithContexts(
-        <AdvancedInventoryHostList inventory={clonedInventory} />
+        <SmartInventoryHostList inventory={clonedInventory} />
       );
     });
     await waitForElement(wrapper, 'ContentLoading', (el) => el.length === 0);
@@ -55,12 +55,12 @@ describe('<AdvancedInventoryHostList />', () => {
   });
 
   test('initially renders successfully', () => {
-    expect(wrapper.find('AdvancedInventoryHostList').length).toBe(1);
+    expect(wrapper.find('SmartInventoryHostList').length).toBe(1);
   });
 
   test('should fetch hosts from api and render them in the list', () => {
     expect(InventoriesAPI.readHosts).toHaveBeenCalled();
-    expect(wrapper.find('AdvancedInventoryHostListItem').length).toBe(3);
+    expect(wrapper.find('SmartInventoryHostListItem').length).toBe(3);
   });
 
   test('should select and deselect all items', async () => {
@@ -87,7 +87,7 @@ describe('<AdvancedInventoryHostList />', () => {
     );
     await act(async () => {
       wrapper = mountWithContexts(
-        <AdvancedInventoryHostList inventory={mockInventory} />
+        <SmartInventoryHostList inventory={mockInventory} />
       );
     });
     await waitForElement(wrapper, 'ContentError', (el) => el.length === 1);

awx/ui/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostListItem.js

@@ -9,26 +9,20 @@ import { Tr, Td } from '@patternfly/react-table';
 import Sparkline from 'components/Sparkline';
 import { Host } from 'types';
 
-function AdvancedInventoryHostListItem({
+function SmartInventoryHostListItem({
   detailUrl,
-  host: {
+  host,
-    name,
-    id,
-    summary_fields: { recent_jobs, inventory },
-  },
   isSelected,
   onSelect,
   rowIndex,
-  inventoryType,
 }) {
-  const recentPlaybookJobs = recent_jobs.map((job) => ({
+  const recentPlaybookJobs = host.summary_fields.recent_jobs.map((job) => ({
     ...job,
     type: 'job',
   }));
-  const inventoryKind = inventory.kind === '' ? 'inventory' : inventoryType;
+
-  const inventoryLink = `/inventories/${inventoryKind}/${inventory.id}/details`;
   return (
-    <Tr id={`host-row-${id}`} ouiaId={`host-row-${id}`}>
+    <Tr id={`host-row-${host.id}`} ouiaId={`host-row-${host.id}`}>
       <Td
         select={{
           rowIndex,
@@ -38,24 +32,28 @@ function AdvancedInventoryHostListItem({
       />
       <Td dataLabel={t`Name`}>
         <Link to={`${detailUrl}`}>
-          <b>{name}</b>
+          <b>{host.name}</b>
         </Link>
       </Td>
       <Td dataLabel={t`Recent jobs`}>
         <Sparkline jobs={recentPlaybookJobs} />
       </Td>
       <Td dataLabel={t`Inventory`}>
-        <Link to={inventoryLink}>{inventory.name}</Link>
+        <Link
+          to={`/inventories/inventory/${host.summary_fields.inventory.id}/details`}
+        >
+          {host.summary_fields.inventory.name}
+        </Link>
       </Td>
     </Tr>
   );
 }
 
-AdvancedInventoryHostListItem.propTypes = {
+SmartInventoryHostListItem.propTypes = {
   detailUrl: string.isRequired,
   host: Host.isRequired,
   isSelected: bool.isRequired,
   onSelect: func.isRequired,
 };
 
-export default AdvancedInventoryHostListItem;
+export default SmartInventoryHostListItem;

awx/ui/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostListItem.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { mountWithContexts } from '../../../../testUtils/enzymeHelpers';
-import AdvancedInventoryHostListItem from './AdvancedInventoryHostListItem';
+import SmartInventoryHostListItem from './SmartInventoryHostListItem';
 
 const mockHost = {
   id: 2,
@@ -19,14 +19,14 @@ const mockHost = {
   },
 };
 
-describe('<AdvancedInventoryHostListItem />', () => {
+describe('<SmartInventoryHostListItem />', () => {
   let wrapper;
 
   beforeEach(() => {
     wrapper = mountWithContexts(
       <table>
         <tbody>
-          <AdvancedInventoryHostListItem
+          <SmartInventoryHostListItem
             detailUrl="/inventories/smart_inventory/1/hosts/2"
             host={mockHost}
             isSelected={false}