chore: refining items

ref: #319 #320 nofusscomputing/centurion_erp_ui#1

app/api/v2/serializers/core/ticket_linked_item.py

@@ -16,7 +16,8 @@ class TicketLinkedItemBaseSerializer(serializers.ModelSerializer):
 
     def get_display_name(self, item):
 
-        return '#' + str( item.ticket.id )
+        return str( item )
+
 
     url = serializers.HyperlinkedIdentityField(
         view_name="API:_api_v2_device-detail", format="html"

app/api/v2/serializers/itam/device_model.py

@@ -15,13 +15,6 @@ def get_display_name(self, item):
 
         return str( item )
 
-    # _urls = serializers.SerializerMethodField('get_url')
-
-    # def get_url(self, obj):
-
-    #     return {
-    #         '_self': reverse("API:_api_v2_device-detail", request=self._context['view'].request, kwargs={'pk': obj.pk})
-    #     }
 
     url = serializers.HyperlinkedIdentityField(
         view_name="API:_api_v2_device_model-detail", format="html"
@@ -49,7 +42,14 @@ class Meta:
 
 class ModelSerializer(BaseSerializer):
 
-    pass
+
+    _urls = serializers.SerializerMethodField('get_url')
+
+    def get_url(self, obj):
+
+        return {
+            '_self': reverse("API:_api_v2_device_model-detail", request=self._context['view'].request, kwargs={'pk': obj.pk})
+        }
 
     class Meta:
 
@@ -73,14 +73,14 @@ class Meta:
     #         '_urls',
     #     ]
 
-    #     read_only_fields = [
-    #         'id',
+        read_only_fields = [
+            'id',
     #         'display_name',
     #         'inventorydate',
     #         'created',
     #         'modified',
-    #         '_urls',
-    #     ]
+            '_urls',
+        ]
 
 
 

app/api/v2/tests/functional/abstract/test_view_set_functional.py

@@ -0,0 +1,17 @@
+
+from django.test import TestCase
+
+
+
+class ViewSetAttributesUnit:
+    """ Funcntional Tests For View Setd.
+
+    These tests ensure that View sets functionality is correct.
+    """
+
+    @pytest.mark.skip(reason='to be writtem')
+    def test_data_queryset(self):
+        """test data returned is from the users orgs only
+        """
+
+        pass

app/api/v2/tests/unit/abstract/test_view_set_unit.py

@@ -0,0 +1,47 @@
+
+from django.test import TestCase
+
+
+
+class ViewSetAttributesUnit:
+    """ Unit Tests For View Set attributes.
+
+    These tests ensure that View sets contian the required attributesthat are
+    used by the API .
+    """
+
+
+    def test_attribute_exists_page_layout(self):
+        """Attrribute Test, Exists
+
+        Ensure attribute `page_layout` exists
+        """
+
+        pass
+
+
+    def test_attribute_type_page_layout(self):
+        """Attrribute Test, Type
+
+        Ensure attribute `page_layout` is of type `list`
+        """
+
+        pass
+
+
+    def test_attribute_not_callable_page_layout(self):
+        """Attrribute Test, Not Callable
+
+        Attribute must be a property
+
+        Ensure attribute `page_layout` is not callable.
+        """
+
+        pass
+
+# other tests required
+# - filterset_fields
+# - metadata_class
+# - search_fields
+# - documentation
+# - model_documentation or is in `model.documentation`

app/api/v2/views/settings/device_model.py

@@ -9,6 +9,7 @@
 from access.mixin import OrganizationMixin
 
 from api.v2.serializers.itam.device_model import ModelSerializer, ViewSerializer
+from api.v2.views.metadata import NavigationMetadata
 from api.views.mixin import OrganizationPermissionAPI
 
 from itam.models.device_models import DeviceModel
@@ -17,12 +18,16 @@
 
 class ViewSet(OrganizationMixin, viewsets.ModelViewSet):
 
+    metadata_class = NavigationMetadata
+
     permission_classes = [
         OrganizationPermissionAPI
     ]
 
     queryset = DeviceModel.objects.all()
 
+    page_layout = DeviceModel.page_layout
+
     def get_serializer_class(self):
 
         if (

app/api/v2/views/settings/external_link.py

@@ -9,6 +9,7 @@
 from access.mixin import OrganizationMixin
 
 from settings.serializers.external_links import ExternalLink, ExternalLinkModelSerializer, ExternalLinkViewSerializer
+from api.v2.views.metadata import NavigationMetadata
 from api.views.mixin import OrganizationPermissionAPI
 
 # from settings.models.external_link import ExternalLink
@@ -22,6 +23,8 @@ class ViewSet(OrganizationMixin, viewsets.ModelViewSet):
         'software',
     ]
 
+    metadata_class = NavigationMetadata
+
     permission_classes = [
         OrganizationPermissionAPI
     ]

app/api/v2/views/settings/index.py

@@ -16,7 +16,24 @@ class Index(viewsets.ViewSet):
     permission_classes = []
 
     page_layout: list = [
-        "sdas"
+        {
+            "name": "Core",
+            "links": [
+                {
+                    "name": "External Links",
+                    "model": "external_link"
+                }
+            ]
+        },
+        {
+            "name": "ITAM",
+            "links": [
+                {
+                    "name": "Device Model",
+                    "model": "device_model"
+                }
+            ]
+        }
     ]
 
     def get_view_name(self):

app/itam/models/device_models.py

@@ -31,6 +31,42 @@ class Meta:
         blank= True
     )
 
+    table_fields: list = [
+        'manufacturer',
+        'name',
+        'organization',
+        'created',
+        'modified'
+    ]
+
+    page_layout: dict = [
+        {
+            "name": "Details",
+            "slug": "details",
+            "sections": [
+                {
+                    "layout": "double",
+                    "left": [
+                        'organization',
+                        'manufacturer',
+                        'name',
+                        'created',
+                        'modified',
+                    ],
+                    "right": [
+                        'model_notes',
+                        'is_global',
+                    ]
+                }
+            ]
+        },
+        # {
+        #     "name": "Notes",
+        #     "slug": "notes",
+        #     "sections": []
+        # }
+    ]
+
 
     def clean(self):