refactor(apis_metainfo): drop Uri customizations

apis_core/apis_metainfo/filtersets.py

@@ -0,0 +1,9 @@
+import django_filters
+from apis_core.generic.filtersets import GenericFilterSet
+
+
+class UriFilterSet(GenericFilterSet):
+    uri = django_filters.CharFilter(lookup_expr="icontains")
+
+    class Meta(GenericFilterSet.Meta):
+        fields = ("uri",)

apis_core/apis_metainfo/forms.py

@@ -1,41 +1,18 @@
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import Submit
-from dal import autocomplete
 from django import forms
 from django.core.exceptions import ValidationError
+from apis_core.generic.forms import GenericModelForm
 
 from .models import Uri
 
 
-class UriForm(forms.ModelForm):
-    class Meta:
-        model = Uri
-        fields = "__all__"
-        widgets = {
-            "entity": autocomplete.ModelSelect2(
-                url="apis_core:apis_metainfo-ac:apis_tempentity-autocomplete"
-            ),
-        }
-
+class UriForm(GenericModelForm):
     def __init__(self, *args, **kwargs):
-        super(UriForm, self).__init__(*args, **kwargs)
-        self.helper = FormHelper()
-        self.helper.form_tag = True
+        super().__init__(*args, **kwargs)
         self.helper.form_class = "form-horizontal"
         self.helper.label_class = "col-md-3"
         self.helper.field_class = "col-md-9"
-        self.helper.add_input(
-            Submit("submit", "save"),
-        )
-
-
-class UriFilterFormHelper(FormHelper):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.helper = FormHelper()
-        self.form_method = "GET"
-        self.helper.form_tag = False
-        self.add_input(Submit("filter", "Filter"))
 
 
 class UriGetOrCreateForm(forms.Form):

apis_core/apis_metainfo/tables.py

@@ -1,6 +1,7 @@
 import django_tables2 as tables
 from django.db.models import F
 from django.utils.html import format_html
+from apis_core.generic.tables import GenericTable
 
 from .models import Uri
 
@@ -100,8 +101,7 @@ def generic_render_end_date_written(self, record, value):
     )
 
 
-class UriTable(tables.Table):
-    id = tables.LinkColumn()
+class UriTable(GenericTable):
     entity = tables.TemplateColumn(
         "<a href='{{ record.root_object.get_absolute_url }}'>{{ record.root_object }}</a>",
         orderable=True,
@@ -113,8 +113,6 @@ class UriTable(tables.Table):
         verbose_name="Entity Type",
     )
 
-    class Meta:
+    class Meta(GenericTable.Meta):
         model = Uri
-        sequence = ("id", "uri")
-        fields = ("id", "uri", "entity", "ent_type")
-        attrs = {"class": "table table-responsive table-hover"}
+        fields = ["id", "desc", "entity", "ent_type"]

apis_core/apis_metainfo/urls.py

@@ -5,10 +5,5 @@
 app_name = "apis_metainfo"
 
 urlpatterns = [
-    path("apis/metainfo/uri/", views.UriListView.as_view(), name="uri_browse"),
-    path("uri/detail/<int:pk>", views.UriDetailView.as_view(), name="uri_detail"),
-    path("uri/create/", views.UriCreate.as_view(), name="uri_create"),
-    path("uri/edit/<int:pk>", views.UriUpdate.as_view(), name="uri_edit"),
-    path("uri/delete/<int:pk>", views.UriDelete.as_view(), name="uri_delete"),
     path("uri/getorcreate/", views.UriGetOrCreate.as_view(), name="uri_get_or_create"),
 ]

apis_core/apis_metainfo/views.py

@@ -1,50 +1,6 @@
-from django.conf import settings
-from django.urls import reverse_lazy
-from django.views.generic.detail import DetailView
-from django.views.generic.edit import DeleteView, FormView, CreateView, UpdateView
-from django.contrib.auth.mixins import LoginRequiredMixin
-from django_tables2 import SingleTableMixin
-from django_filters.views import FilterView
+from django.views.generic.edit import FormView
 
-from .filters import UriListFilter
-from .forms import UriFilterFormHelper, UriForm, UriGetOrCreateForm
-from .models import Uri
-from .tables import UriTable
-
-
-class UriListView(SingleTableMixin, FilterView):
-    model = Uri
-    filterset_class = UriListFilter
-    formhelper_class = UriFilterFormHelper
-    table_class = UriTable
-    template_name = getattr(settings, "APIS_LIST_VIEW_TEMPLATE", "generic_list.html")
-
-    def get_filterset(self, filterset_class):
-        kwargs = self.get_filterset_kwargs(filterset_class)
-        filterset = filterset_class(**kwargs)
-        filterset.form.helper = self.formhelper_class()
-        return filterset
-
-
-class UriDetailView(DetailView):
-    model = Uri
-    template_name = "apis_metainfo/uri_detail.html"
-
-
-class UriCreate(LoginRequiredMixin, CreateView):
-    model = Uri
-    form_class = UriForm
-
-
-class UriUpdate(LoginRequiredMixin, UpdateView):
-    model = Uri
-    form_class = UriForm
-
-
-class UriDelete(LoginRequiredMixin, DeleteView):
-    model = Uri
-    template_name = "confirm_delete.html"
-    success_url = reverse_lazy("apis_core:apis_metainfo:uri_browse")
+from .forms import UriGetOrCreateForm
 
 
 class UriGetOrCreate(FormView):