Re-organize the versioned ui api code files. (#2253)

Now that we have two versions of the ui api, this change organizes them into subfolders to match the pattern we have in the non-ui api code. No-Issue Signed-off-by: James Tanner <[email protected]>
ansible · Sep 5, 2024 · 87a759d · 87a759d
1 parent 08dc2d6
commit 87a759d
Show file tree

Hide file tree

Showing 47 changed files with 17 additions and 17 deletions.
diff --git a/galaxy_ng/app/api/ui/__init__.py → galaxy_ng/app/api/ui/v1/__init__.py b/galaxy_ng/app/api/ui/__init__.py → galaxy_ng/app/api/ui/v1/__init__.py
diff --git a/galaxy_ng/app/api/ui/serializers/__init__.py → ..._ng/app/api/ui/v1/serializers/__init__.py b/galaxy_ng/app/api/ui/serializers/__init__.py → ..._ng/app/api/ui/v1/serializers/__init__.py
diff --git a/galaxy_ng/app/api/ui/serializers/auth.py → galaxy_ng/app/api/ui/v1/serializers/auth.py b/galaxy_ng/app/api/ui/serializers/auth.py → galaxy_ng/app/api/ui/v1/serializers/auth.py
diff --git a/galaxy_ng/app/api/ui/serializers/base.py → galaxy_ng/app/api/ui/v1/serializers/base.py b/galaxy_ng/app/api/ui/serializers/base.py → galaxy_ng/app/api/ui/v1/serializers/base.py
diff --git a/...y_ng/app/api/ui/serializers/collection.py → ...g/app/api/ui/v1/serializers/collection.py b/...y_ng/app/api/ui/serializers/collection.py → ...g/app/api/ui/v1/serializers/collection.py
diff --git a/...ng/app/api/ui/serializers/distribution.py → ...app/api/ui/v1/serializers/distribution.py b/...ng/app/api/ui/serializers/distribution.py → ...app/api/ui/v1/serializers/distribution.py
diff --git a/...i/ui/serializers/execution_environment.py → ...i/v1/serializers/execution_environment.py b/...i/ui/serializers/execution_environment.py → ...i/v1/serializers/execution_environment.py
diff --git a/galaxy_ng/app/api/ui/serializers/imports.py → ...y_ng/app/api/ui/v1/serializers/imports.py b/galaxy_ng/app/api/ui/serializers/imports.py → ...y_ng/app/api/ui/v1/serializers/imports.py
diff --git a/galaxy_ng/app/api/ui/serializers/search.py → ...xy_ng/app/api/ui/v1/serializers/search.py b/galaxy_ng/app/api/ui/serializers/search.py → ...xy_ng/app/api/ui/v1/serializers/search.py
diff --git a/galaxy_ng/app/api/ui/serializers/synclist.py → ..._ng/app/api/ui/v1/serializers/synclist.py b/galaxy_ng/app/api/ui/serializers/synclist.py → ..._ng/app/api/ui/v1/serializers/synclist.py
diff --git a/galaxy_ng/app/api/ui/serializers/user.py → galaxy_ng/app/api/ui/v1/serializers/user.py b/galaxy_ng/app/api/ui/serializers/user.py → galaxy_ng/app/api/ui/v1/serializers/user.py
diff --git a/galaxy_ng/app/api/ui/urls.py → galaxy_ng/app/api/ui/v1/urls.py b/galaxy_ng/app/api/ui/urls.py → galaxy_ng/app/api/ui/v1/urls.py
diff --git a/galaxy_ng/app/api/ui/versioning.py → galaxy_ng/app/api/ui/v1/versioning.py b/galaxy_ng/app/api/ui/versioning.py → galaxy_ng/app/api/ui/v1/versioning.py
diff --git a/galaxy_ng/app/api/ui/views/__init__.py → galaxy_ng/app/api/ui/v1/views/__init__.py b/galaxy_ng/app/api/ui/views/__init__.py → galaxy_ng/app/api/ui/v1/views/__init__.py
diff --git a/galaxy_ng/app/api/ui/views/ai_index.py → galaxy_ng/app/api/ui/v1/views/ai_index.py b/galaxy_ng/app/api/ui/views/ai_index.py → galaxy_ng/app/api/ui/v1/views/ai_index.py
diff --git a/galaxy_ng/app/api/ui/views/auth.py → galaxy_ng/app/api/ui/v1/views/auth.py b/galaxy_ng/app/api/ui/views/auth.py → 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 → galaxy_ng/app/api/ui/v1/views/controller.py b/galaxy_ng/app/api/ui/views/controller.py → galaxy_ng/app/api/ui/v1/views/controller.py
diff --git a/galaxy_ng/app/api/ui/views/feature_flags.py → ...y_ng/app/api/ui/v1/views/feature_flags.py b/galaxy_ng/app/api/ui/views/feature_flags.py → ...y_ng/app/api/ui/v1/views/feature_flags.py
diff --git a/.../ui/views/index_execution_environments.py → .../v1/views/index_execution_environments.py b/.../ui/views/index_execution_environments.py → .../v1/views/index_execution_environments.py
diff --git a/galaxy_ng/app/api/ui/views/landing_page.py → ...xy_ng/app/api/ui/v1/views/landing_page.py b/galaxy_ng/app/api/ui/views/landing_page.py → ...xy_ng/app/api/ui/v1/views/landing_page.py
diff --git a/galaxy_ng/app/api/ui/views/search.py → galaxy_ng/app/api/ui/v1/views/search.py b/galaxy_ng/app/api/ui/views/search.py → 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 → galaxy_ng/app/api/ui/v1/views/settings.py b/galaxy_ng/app/api/ui/views/settings.py → galaxy_ng/app/api/ui/v1/views/settings.py
diff --git a/galaxy_ng/app/api/ui/views/signing.py → galaxy_ng/app/api/ui/v1/views/signing.py b/galaxy_ng/app/api/ui/views/signing.py → galaxy_ng/app/api/ui/v1/views/signing.py
diff --git a/galaxy_ng/app/api/ui/views/sync.py → galaxy_ng/app/api/ui/v1/views/sync.py b/galaxy_ng/app/api/ui/views/sync.py → galaxy_ng/app/api/ui/v1/views/sync.py
diff --git a/galaxy_ng/app/api/ui/viewsets/__init__.py → galaxy_ng/app/api/ui/v1/viewsets/__init__.py b/galaxy_ng/app/api/ui/viewsets/__init__.py → galaxy_ng/app/api/ui/v1/viewsets/__init__.py
diff --git a/galaxy_ng/app/api/ui/viewsets/collection.py → ...y_ng/app/api/ui/v1/viewsets/collection.py b/galaxy_ng/app/api/ui/viewsets/collection.py → ...y_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/...xy_ng/app/api/ui/viewsets/distribution.py → ...ng/app/api/ui/v1/viewsets/distribution.py b/...xy_ng/app/api/ui/viewsets/distribution.py → ...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/.../api/ui/viewsets/execution_environment.py → ...i/ui/v1/viewsets/execution_environment.py b/.../api/ui/viewsets/execution_environment.py → ...i/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 → galaxy_ng/app/api/ui/v1/viewsets/group.py b/galaxy_ng/app/api/ui/viewsets/group.py → galaxy_ng/app/api/ui/v1/viewsets/group.py
diff --git a/...xy_ng/app/api/ui/viewsets/my_namespace.py → ...ng/app/api/ui/v1/viewsets/my_namespace.py b/...xy_ng/app/api/ui/viewsets/my_namespace.py → ...ng/app/api/ui/v1/viewsets/my_namespace.py
diff --git a/galaxy_ng/app/api/ui/viewsets/my_synclist.py → ..._ng/app/api/ui/v1/viewsets/my_synclist.py b/galaxy_ng/app/api/ui/viewsets/my_synclist.py → ..._ng/app/api/ui/v1/viewsets/my_synclist.py
diff --git a/galaxy_ng/app/api/ui/viewsets/namespace.py → ...xy_ng/app/api/ui/v1/viewsets/namespace.py b/galaxy_ng/app/api/ui/viewsets/namespace.py → ...xy_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 → galaxy_ng/app/api/ui/v1/viewsets/root.py b/galaxy_ng/app/api/ui/viewsets/root.py → galaxy_ng/app/api/ui/v1/viewsets/root.py
diff --git a/galaxy_ng/app/api/ui/viewsets/synclist.py → galaxy_ng/app/api/ui/v1/viewsets/synclist.py b/galaxy_ng/app/api/ui/viewsets/synclist.py → 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 → galaxy_ng/app/api/ui/v1/viewsets/tags.py b/galaxy_ng/app/api/ui/viewsets/tags.py → 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 → galaxy_ng/app/api/ui/v1/viewsets/user.py b/galaxy_ng/app/api/ui/viewsets/user.py → 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 → galaxy_ng/app/api/ui/v2/filters.py b/galaxy_ng/app/api/ui_v2/filters.py → galaxy_ng/app/api/ui/v2/filters.py
diff --git a/galaxy_ng/app/api/ui_v2/permissions.py → galaxy_ng/app/api/ui/v2/permissions.py b/galaxy_ng/app/api/ui_v2/permissions.py → galaxy_ng/app/api/ui/v2/permissions.py
diff --git a/galaxy_ng/app/api/ui_v2/serializers.py → galaxy_ng/app/api/ui/v2/serializers.py b/galaxy_ng/app/api/ui_v2/serializers.py → galaxy_ng/app/api/ui/v2/serializers.py
diff --git a/galaxy_ng/app/api/ui_v2/urls.py → galaxy_ng/app/api/ui/v2/urls.py b/galaxy_ng/app/api/ui_v2/urls.py → galaxy_ng/app/api/ui/v2/urls.py
diff --git a/galaxy_ng/app/api/ui_v2/views.py → galaxy_ng/app/api/ui/v2/views.py b/galaxy_ng/app/api/ui_v2/views.py → galaxy_ng/app/api/ui/v2/views.py
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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