refactor (old) ui into proper package

Author: dogboat

dojo/cicd_infrastructure/ui/__init__.py

@@ -0,0 +1,14 @@
+from django import forms
+
+from dojo.models import CICDInfrastructure
+
+
+class CICDInfrastructureForm(forms.ModelForm):
+    class Meta:
+        model = CICDInfrastructure
+        fields = ["name", "description", "url", "infrastructure_type"]
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if self.instance.pk:
+            self.fields["infrastructure_type"].disabled = True

dojo/cicd_infrastructure/ui/forms.py

@@ -1,6 +1,6 @@
 from django.urls import re_path
 
-from . import views
+from dojo.cicd_infrastructure.ui import views
 
 urlpatterns = [
     re_path(r"^cicd_infrastructure/add$", views.new_cicd_infrastructure, name="add_cicd_infrastructure"),

dojo/cicd_infrastructure/urls.py dojo/cicd_infrastructure/ui/urls.pydojo/cicd_infrastructure/urls.py renamed to dojo/cicd_infrastructure/ui/urls.py

@@ -7,7 +7,7 @@
 from django.utils.translation import gettext as _
 
 from dojo.authorization.authorization_decorators import user_is_configuration_authorized
-from dojo.forms import CICDInfrastructureForm
+from dojo.cicd_infrastructure.ui.forms import CICDInfrastructureForm
 from dojo.models import CICDInfrastructure
 from dojo.utils import add_breadcrumb
 

dojo/cicd_infrastructure/views.py dojo/cicd_infrastructure/ui/views.pydojo/cicd_infrastructure/views.py renamed to dojo/cicd_infrastructure/ui/views.py

@@ -69,7 +69,6 @@
     Choice,
     ChoiceAnswer,
     ChoiceQuestion,
-    CICDInfrastructure,
     Development_Environment,
     Dojo_User,
     DojoMeta,
@@ -2648,17 +2647,6 @@ def clean(self):
         return form_data
 
 
-class CICDInfrastructureForm(forms.ModelForm):
-    class Meta:
-        model = CICDInfrastructure
-        fields = ["name", "description", "url", "infrastructure_type"]
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        if self.instance.pk:
-            self.fields["infrastructure_type"].disabled = True
-
-
 class SLAConfigForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)

dojo/forms.py

@@ -62,7 +62,7 @@
 from dojo.banner.urls import urlpatterns as banner_urls
 from dojo.benchmark.urls import urlpatterns as benchmark_urls
 from dojo.cicd_infrastructure.api.urls import add_cicd_infrastructure_urls
-from dojo.cicd_infrastructure.urls import urlpatterns as cicd_infrastructure_urls
+from dojo.cicd_infrastructure.ui.urls import urlpatterns as cicd_infrastructure_urls
 from dojo.components.urls import urlpatterns as component_urls
 from dojo.development_environment.urls import urlpatterns as dev_env_urls
 from dojo.endpoint.urls import urlpatterns as endpoint_urls

dojo/urls.py

@@ -10,7 +10,7 @@
 from rest_framework.authtoken.models import Token
 from rest_framework.test import APIClient, APITestCase
 
-from dojo.forms import CICDInfrastructureForm
+from dojo.cicd_infrastructure.ui.forms import CICDInfrastructureForm
 from dojo.models import CICDInfrastructure
 from unittests.dojo_test_case import versioned_fixtures