diff --git a/galaxy_ng/app/api/ui/__init__.py b/galaxy_ng/app/api/ui/v1/__init__.py similarity index 100% rename from galaxy_ng/app/api/ui/__init__.py rename to galaxy_ng/app/api/ui/v1/__init__.py diff --git a/galaxy_ng/app/api/ui/serializers/__init__.py b/galaxy_ng/app/api/ui/v1/serializers/__init__.py similarity index 100% rename from galaxy_ng/app/api/ui/serializers/__init__.py rename to galaxy_ng/app/api/ui/v1/serializers/__init__.py diff --git a/galaxy_ng/app/api/ui/serializers/auth.py b/galaxy_ng/app/api/ui/v1/serializers/auth.py similarity index 100% rename from galaxy_ng/app/api/ui/serializers/auth.py rename to galaxy_ng/app/api/ui/v1/serializers/auth.py diff --git a/galaxy_ng/app/api/ui/serializers/base.py b/galaxy_ng/app/api/ui/v1/serializers/base.py similarity index 100% rename from galaxy_ng/app/api/ui/serializers/base.py rename to galaxy_ng/app/api/ui/v1/serializers/base.py diff --git a/galaxy_ng/app/api/ui/serializers/collection.py b/galaxy_ng/app/api/ui/v1/serializers/collection.py similarity index 100% rename from galaxy_ng/app/api/ui/serializers/collection.py rename to galaxy_ng/app/api/ui/v1/serializers/collection.py diff --git a/galaxy_ng/app/api/ui/serializers/distribution.py b/galaxy_ng/app/api/ui/v1/serializers/distribution.py similarity index 100% rename from galaxy_ng/app/api/ui/serializers/distribution.py rename to galaxy_ng/app/api/ui/v1/serializers/distribution.py diff --git a/galaxy_ng/app/api/ui/serializers/execution_environment.py b/galaxy_ng/app/api/ui/v1/serializers/execution_environment.py similarity index 100% rename from galaxy_ng/app/api/ui/serializers/execution_environment.py rename to galaxy_ng/app/api/ui/v1/serializers/execution_environment.py diff --git a/galaxy_ng/app/api/ui/serializers/imports.py b/galaxy_ng/app/api/ui/v1/serializers/imports.py similarity index 100% rename from galaxy_ng/app/api/ui/serializers/imports.py rename to galaxy_ng/app/api/ui/v1/serializers/imports.py diff --git a/galaxy_ng/app/api/ui/serializers/search.py b/galaxy_ng/app/api/ui/v1/serializers/search.py similarity index 100% rename from galaxy_ng/app/api/ui/serializers/search.py rename to galaxy_ng/app/api/ui/v1/serializers/search.py diff --git a/galaxy_ng/app/api/ui/serializers/synclist.py b/galaxy_ng/app/api/ui/v1/serializers/synclist.py similarity index 100% rename from galaxy_ng/app/api/ui/serializers/synclist.py rename to galaxy_ng/app/api/ui/v1/serializers/synclist.py diff --git a/galaxy_ng/app/api/ui/serializers/user.py b/galaxy_ng/app/api/ui/v1/serializers/user.py similarity index 100% rename from galaxy_ng/app/api/ui/serializers/user.py rename to galaxy_ng/app/api/ui/v1/serializers/user.py diff --git a/galaxy_ng/app/api/ui/urls.py b/galaxy_ng/app/api/ui/v1/urls.py similarity index 100% rename from galaxy_ng/app/api/ui/urls.py rename to galaxy_ng/app/api/ui/v1/urls.py diff --git a/galaxy_ng/app/api/ui/versioning.py b/galaxy_ng/app/api/ui/v1/versioning.py similarity index 100% rename from galaxy_ng/app/api/ui/versioning.py rename to galaxy_ng/app/api/ui/v1/versioning.py diff --git a/galaxy_ng/app/api/ui/views/__init__.py b/galaxy_ng/app/api/ui/v1/views/__init__.py similarity index 100% rename from galaxy_ng/app/api/ui/views/__init__.py rename to galaxy_ng/app/api/ui/v1/views/__init__.py diff --git a/galaxy_ng/app/api/ui/views/ai_index.py b/galaxy_ng/app/api/ui/v1/views/ai_index.py similarity index 100% rename from galaxy_ng/app/api/ui/views/ai_index.py rename to galaxy_ng/app/api/ui/v1/views/ai_index.py diff --git a/galaxy_ng/app/api/ui/views/auth.py b/galaxy_ng/app/api/ui/v1/views/auth.py similarity index 98% rename from galaxy_ng/app/api/ui/views/auth.py rename to galaxy_ng/app/api/ui/v1/views/auth.py index 249f78ff29..f358f550e4 100644 --- a/galaxy_ng/app/api/ui/views/auth.py +++ b/galaxy_ng/app/api/ui/v1/views/auth.py @@ -12,7 +12,7 @@ from galaxy_ng.app.api import base as api_base from galaxy_ng.app.access_control import access_policy -from galaxy_ng.app.api.ui.serializers import LoginSerializer +from galaxy_ng.app.api.ui.v1.serializers import LoginSerializer from galaxy_ng.app.auth.session import SessionAuthentication from requests import post as requests_post diff --git a/galaxy_ng/app/api/ui/views/controller.py b/galaxy_ng/app/api/ui/v1/views/controller.py similarity index 100% rename from galaxy_ng/app/api/ui/views/controller.py rename to galaxy_ng/app/api/ui/v1/views/controller.py diff --git a/galaxy_ng/app/api/ui/views/feature_flags.py b/galaxy_ng/app/api/ui/v1/views/feature_flags.py similarity index 100% rename from galaxy_ng/app/api/ui/views/feature_flags.py rename to galaxy_ng/app/api/ui/v1/views/feature_flags.py diff --git a/galaxy_ng/app/api/ui/views/index_execution_environments.py b/galaxy_ng/app/api/ui/v1/views/index_execution_environments.py similarity index 100% rename from galaxy_ng/app/api/ui/views/index_execution_environments.py rename to galaxy_ng/app/api/ui/v1/views/index_execution_environments.py diff --git a/galaxy_ng/app/api/ui/views/landing_page.py b/galaxy_ng/app/api/ui/v1/views/landing_page.py similarity index 100% rename from galaxy_ng/app/api/ui/views/landing_page.py rename to galaxy_ng/app/api/ui/v1/views/landing_page.py diff --git a/galaxy_ng/app/api/ui/views/search.py b/galaxy_ng/app/api/ui/v1/views/search.py similarity index 99% rename from galaxy_ng/app/api/ui/views/search.py rename to galaxy_ng/app/api/ui/v1/views/search.py index 1354c9772d..3bbc4bc304 100644 --- a/galaxy_ng/app/api/ui/views/search.py +++ b/galaxy_ng/app/api/ui/v1/views/search.py @@ -25,7 +25,7 @@ from rest_framework.permissions import AllowAny from galaxy_ng.app.api import base as api_base -from galaxy_ng.app.api.ui.serializers import SearchResultsSerializer +from galaxy_ng.app.api.ui.v1.serializers import SearchResultsSerializer from galaxy_ng.app.api.v1.models import LegacyRole from galaxy_ng.app.models.namespace import Namespace diff --git a/galaxy_ng/app/api/ui/views/settings.py b/galaxy_ng/app/api/ui/v1/views/settings.py similarity index 100% rename from galaxy_ng/app/api/ui/views/settings.py rename to galaxy_ng/app/api/ui/v1/views/settings.py diff --git a/galaxy_ng/app/api/ui/views/signing.py b/galaxy_ng/app/api/ui/v1/views/signing.py similarity index 100% rename from galaxy_ng/app/api/ui/views/signing.py rename to galaxy_ng/app/api/ui/v1/views/signing.py diff --git a/galaxy_ng/app/api/ui/views/sync.py b/galaxy_ng/app/api/ui/v1/views/sync.py similarity index 100% rename from galaxy_ng/app/api/ui/views/sync.py rename to galaxy_ng/app/api/ui/v1/views/sync.py diff --git a/galaxy_ng/app/api/ui/viewsets/__init__.py b/galaxy_ng/app/api/ui/v1/viewsets/__init__.py similarity index 100% rename from galaxy_ng/app/api/ui/viewsets/__init__.py rename to galaxy_ng/app/api/ui/v1/viewsets/__init__.py diff --git a/galaxy_ng/app/api/ui/viewsets/collection.py b/galaxy_ng/app/api/ui/v1/viewsets/collection.py similarity index 99% rename from galaxy_ng/app/api/ui/viewsets/collection.py rename to galaxy_ng/app/api/ui/v1/viewsets/collection.py index e2529d938e..19e72061d5 100644 --- a/galaxy_ng/app/api/ui/viewsets/collection.py +++ b/galaxy_ng/app/api/ui/v1/viewsets/collection.py @@ -24,7 +24,7 @@ from galaxy_ng.app.api import base as api_base from galaxy_ng.app.access_control import access_policy -from galaxy_ng.app.api.ui import serializers, versioning +from galaxy_ng.app.api.ui.v1 import serializers, versioning from galaxy_ng.app.api.v3.serializers.sync import CollectionRemoteSerializer diff --git a/galaxy_ng/app/api/ui/viewsets/distribution.py b/galaxy_ng/app/api/ui/v1/viewsets/distribution.py similarity index 95% rename from galaxy_ng/app/api/ui/viewsets/distribution.py rename to galaxy_ng/app/api/ui/v1/viewsets/distribution.py index 0d9ce80a06..e98eb835a9 100644 --- a/galaxy_ng/app/api/ui/viewsets/distribution.py +++ b/galaxy_ng/app/api/ui/v1/viewsets/distribution.py @@ -3,7 +3,7 @@ from pulpcore.plugin.util import get_objects_for_user from galaxy_ng.app.access_control import access_policy -from galaxy_ng.app.api.ui import serializers, versioning +from galaxy_ng.app.api.ui.v1 import serializers, versioning from galaxy_ng.app.api import base as api_base from galaxy_ng.app import models diff --git a/galaxy_ng/app/api/ui/viewsets/execution_environment.py b/galaxy_ng/app/api/ui/v1/viewsets/execution_environment.py similarity index 97% rename from galaxy_ng/app/api/ui/viewsets/execution_environment.py rename to galaxy_ng/app/api/ui/v1/viewsets/execution_environment.py index fff54748cc..5a450f5ed7 100644 --- a/galaxy_ng/app/api/ui/viewsets/execution_environment.py +++ b/galaxy_ng/app/api/ui/v1/viewsets/execution_environment.py @@ -7,7 +7,7 @@ from galaxy_ng.app import models from galaxy_ng.app.access_control import access_policy from galaxy_ng.app.api import base as api_base -from galaxy_ng.app.api.ui import serializers +from galaxy_ng.app.api.ui.v1 import serializers from galaxy_ng.app.api.utils import GetObjectByIdMixin log = logging.getLogger(__name__) diff --git a/galaxy_ng/app/api/ui/viewsets/group.py b/galaxy_ng/app/api/ui/v1/viewsets/group.py similarity index 100% rename from galaxy_ng/app/api/ui/viewsets/group.py rename to galaxy_ng/app/api/ui/v1/viewsets/group.py diff --git a/galaxy_ng/app/api/ui/viewsets/my_namespace.py b/galaxy_ng/app/api/ui/v1/viewsets/my_namespace.py similarity index 100% rename from galaxy_ng/app/api/ui/viewsets/my_namespace.py rename to galaxy_ng/app/api/ui/v1/viewsets/my_namespace.py diff --git a/galaxy_ng/app/api/ui/viewsets/my_synclist.py b/galaxy_ng/app/api/ui/v1/viewsets/my_synclist.py similarity index 100% rename from galaxy_ng/app/api/ui/viewsets/my_synclist.py rename to galaxy_ng/app/api/ui/v1/viewsets/my_synclist.py diff --git a/galaxy_ng/app/api/ui/viewsets/namespace.py b/galaxy_ng/app/api/ui/v1/viewsets/namespace.py similarity index 81% rename from galaxy_ng/app/api/ui/viewsets/namespace.py rename to galaxy_ng/app/api/ui/v1/viewsets/namespace.py index af413408ca..0d9cb830f2 100644 --- a/galaxy_ng/app/api/ui/viewsets/namespace.py +++ b/galaxy_ng/app/api/ui/v1/viewsets/namespace.py @@ -1,7 +1,7 @@ import logging from galaxy_ng.app.api.v3.viewsets.namespace import NamespaceViewSet -from galaxy_ng.app.api.ui import versioning +from galaxy_ng.app.api.ui.v1 import versioning log = logging.getLogger(__name__) diff --git a/galaxy_ng/app/api/ui/viewsets/root.py b/galaxy_ng/app/api/ui/v1/viewsets/root.py similarity index 100% rename from galaxy_ng/app/api/ui/viewsets/root.py rename to galaxy_ng/app/api/ui/v1/viewsets/root.py diff --git a/galaxy_ng/app/api/ui/viewsets/synclist.py b/galaxy_ng/app/api/ui/v1/viewsets/synclist.py similarity index 89% rename from galaxy_ng/app/api/ui/viewsets/synclist.py rename to galaxy_ng/app/api/ui/v1/viewsets/synclist.py index 1df6998408..7a247e758a 100644 --- a/galaxy_ng/app/api/ui/viewsets/synclist.py +++ b/galaxy_ng/app/api/ui/v1/viewsets/synclist.py @@ -3,7 +3,7 @@ from galaxy_ng.app import models from galaxy_ng.app.api import base as api_base from galaxy_ng.app.access_control import access_policy -from galaxy_ng.app.api.ui import serializers +from galaxy_ng.app.api.ui.v1 import serializers log = logging.getLogger(__name__) diff --git a/galaxy_ng/app/api/ui/viewsets/tags.py b/galaxy_ng/app/api/ui/v1/viewsets/tags.py similarity index 98% rename from galaxy_ng/app/api/ui/viewsets/tags.py rename to galaxy_ng/app/api/ui/v1/viewsets/tags.py index 8021f4d82b..e680795d25 100644 --- a/galaxy_ng/app/api/ui/viewsets/tags.py +++ b/galaxy_ng/app/api/ui/v1/viewsets/tags.py @@ -7,7 +7,7 @@ from pulp_ansible.app.serializers import TagSerializer from galaxy_ng.app.api import base as api_base -from galaxy_ng.app.api.ui import versioning +from galaxy_ng.app.api.ui.v1 import versioning from galaxy_ng.app.access_control import access_policy from galaxy_ng.app.api.v1.models import LegacyRoleTag from galaxy_ng.app.api.v1.serializers import LegacyRoleTagSerializer diff --git a/galaxy_ng/app/api/ui/viewsets/user.py b/galaxy_ng/app/api/ui/v1/viewsets/user.py similarity index 96% rename from galaxy_ng/app/api/ui/viewsets/user.py rename to galaxy_ng/app/api/ui/v1/viewsets/user.py index 3733333041..c688b43334 100644 --- a/galaxy_ng/app/api/ui/viewsets/user.py +++ b/galaxy_ng/app/api/ui/v1/viewsets/user.py @@ -5,7 +5,7 @@ from galaxy_ng.app.models import auth as auth_models from galaxy_ng.app.access_control import access_policy -from galaxy_ng.app.api.ui import serializers, versioning +from galaxy_ng.app.api.ui.v1 import serializers, versioning from galaxy_ng.app.api import base as api_base diff --git a/galaxy_ng/app/api/ui_v2/filters.py b/galaxy_ng/app/api/ui/v2/filters.py similarity index 100% rename from galaxy_ng/app/api/ui_v2/filters.py rename to galaxy_ng/app/api/ui/v2/filters.py diff --git a/galaxy_ng/app/api/ui_v2/permissions.py b/galaxy_ng/app/api/ui/v2/permissions.py similarity index 100% rename from galaxy_ng/app/api/ui_v2/permissions.py rename to galaxy_ng/app/api/ui/v2/permissions.py diff --git a/galaxy_ng/app/api/ui_v2/serializers.py b/galaxy_ng/app/api/ui/v2/serializers.py similarity index 100% rename from galaxy_ng/app/api/ui_v2/serializers.py rename to galaxy_ng/app/api/ui/v2/serializers.py diff --git a/galaxy_ng/app/api/ui_v2/urls.py b/galaxy_ng/app/api/ui/v2/urls.py similarity index 100% rename from galaxy_ng/app/api/ui_v2/urls.py rename to galaxy_ng/app/api/ui/v2/urls.py diff --git a/galaxy_ng/app/api/ui_v2/views.py b/galaxy_ng/app/api/ui/v2/views.py similarity index 100% rename from galaxy_ng/app/api/ui_v2/views.py rename to galaxy_ng/app/api/ui/v2/views.py diff --git a/galaxy_ng/app/api/urls.py b/galaxy_ng/app/api/urls.py index 4ea6ebeb8f..a0ab91f732 100644 --- a/galaxy_ng/app/api/urls.py +++ b/galaxy_ng/app/api/urls.py @@ -2,8 +2,8 @@ from django.urls import include, path from . import views -from .ui import urls as ui_urls -from .ui_v2 import urls as ui_v2_urls +from .ui.v1 import urls as ui_v1_urls +from .ui.v2 import urls as ui_v2_urls from .v1 import urls as v1_urls from .v3 import urls as v3_urls @@ -60,7 +60,7 @@ ] urlpatterns = [ - path("_ui/", include((ui_urls, app_name), namespace="ui")), + path("_ui/", include((ui_v1_urls, app_name), namespace="ui")), path("_ui/v2/", include((ui_v2_urls, app_name), namespace="ui_v2")), path("", include((v3_combined, app_name), namespace='v3')), diff --git a/galaxy_ng/app/api/v3/serializers/collection.py b/galaxy_ng/app/api/v3/serializers/collection.py index 171529ca61..4f148dcfab 100644 --- a/galaxy_ng/app/api/v3/serializers/collection.py +++ b/galaxy_ng/app/api/v3/serializers/collection.py @@ -4,7 +4,7 @@ from rest_framework import serializers from rest_framework.exceptions import ValidationError, _get_error_details -from galaxy_ng.app.api.ui.serializers.base import Serializer +from galaxy_ng.app.api.ui.v1.serializers.base import Serializer from galaxy_ng.app.api.utils import parse_collection_filename log = logging.getLogger(__name__) diff --git a/galaxy_ng/app/api/v3/serializers/execution_environment.py b/galaxy_ng/app/api/v3/serializers/execution_environment.py index bcc5508272..fcbd456f98 100644 --- a/galaxy_ng/app/api/v3/serializers/execution_environment.py +++ b/galaxy_ng/app/api/v3/serializers/execution_environment.py @@ -13,7 +13,7 @@ from galaxy_ng.app import models from galaxy_ng.app.access_control.fields import MyPermissionsField -from galaxy_ng.app.api.ui import serializers as ui_serializers +from galaxy_ng.app.api.ui.v1 import serializers as ui_serializers namespace_fields = ("id", "pulp_href", "name", "my_permissions", "owners", "created_at", "updated_at") diff --git a/galaxy_ng/app/settings.py b/galaxy_ng/app/settings.py index 427108df9b..dc3e29958a 100644 --- a/galaxy_ng/app/settings.py +++ b/galaxy_ng/app/settings.py @@ -405,7 +405,7 @@ # -- ANSIBLE BASE RBAC -- # The rbac viewsets inherit from a defined base class to get their # pagination settings -ANSIBLE_BASE_CUSTOM_VIEW_PARENT = "galaxy_ng.app.api.ui_v2.views.BaseView" +ANSIBLE_BASE_CUSTOM_VIEW_PARENT = "galaxy_ng.app.api.ui.v2.views.BaseView" # If a role does not already exist that can give those object permissions # then the system must create one, this is used for naming the auto-created role ANSIBLE_BASE_ROLE_CREATOR_NAME = "{obj._meta.model_name} Creator Role" diff --git a/galaxy_ng/app/tasks/index_registry.py b/galaxy_ng/app/tasks/index_registry.py index 1f733b8c4a..2f66879074 100644 --- a/galaxy_ng/app/tasks/index_registry.py +++ b/galaxy_ng/app/tasks/index_registry.py @@ -12,7 +12,7 @@ from pulp_container.app import models as container_models -from galaxy_ng.app.api.ui import serializers +from galaxy_ng.app.api.ui.v1 import serializers from galaxy_ng.app import models diff --git a/galaxy_ng/app/viewsets.py b/galaxy_ng/app/viewsets.py index 47568a992e..781e5dfd53 100644 --- a/galaxy_ng/app/viewsets.py +++ b/galaxy_ng/app/viewsets.py @@ -4,7 +4,7 @@ from galaxy_ng.app import models from galaxy_ng.app.access_control import access_policy from galaxy_ng.app.access_control.statements.roles import LOCKED_ROLES as GALAXY_LOCKED_ROLES -from galaxy_ng.app.api.ui import serializers +from galaxy_ng.app.api.ui.v1 import serializers from galaxy_ng.app.api.v3.serializers import ( ContainerRepositorySerializer, NamespaceSummarySerializer