Merge branch 'nzism-3-8' of https://github.com/Coffee-007/ciso-assist…

…ant-community into nzism-3-8

.eslintrc.js

@@ -0,0 +1,16 @@
+{
+    "rules": {
+      "@typescript-eslint/no-unused-vars": [
+        "error",
+        {
+          "args": "all",
+          "argsIgnorePattern": "^_",
+          "caughtErrors": "all",
+          "caughtErrorsIgnorePattern": "^_",
+          "destructuredArrayIgnorePattern": "^_",
+          "varsIgnorePattern": "^_",
+          "ignoreRestSiblings": true
+        }
+      ]
+    }
+  }

backend/app_tests/api/test_api_libraries.py

@@ -98,7 +98,10 @@ def test_import_frameworks(self, test):
                 "name": lib_detail_response["name"],
                 "description": lib_detail_response["description"],
                 "urn": lib_detail_response["urn"],
-                "folder": {"str": Folder.get_root_folder().name},
+                "folder": {
+                    "id": str(Folder.get_root_folder().id),
+                    "str": Folder.get_root_folder().name,
+                },
             },
             base_count=1,
             user_group=test.user_group,
@@ -164,7 +167,10 @@ def test_import_risk_matrix(self, test):
                 "name": lib_detail_response["name"],
                 "description": lib_detail_response["description"],
                 "urn": lib_detail_response["urn"],
-                "folder": {"str": Folder.get_root_folder().name},
+                "folder": {
+                    "id": str(Folder.get_root_folder().id),
+                    "str": Folder.get_root_folder().name,
+                },
                 #                                 'json_definition': lib_detail_response  # TODO: restore this test
             },
             base_count=1,

backend/app_tests/api/test_api_reference_controls.py

@@ -107,7 +107,10 @@ def test_get_reference_controls(self, test):
                 "is_published": True,
             },
             {
-                "folder": {"str": Folder.get_root_folder().name},
+                "folder": {
+                    "id": str(Folder.get_root_folder().id),
+                    "str": Folder.get_root_folder().name,
+                },
             },
             user_group=test.user_group,
             scope="Global",
@@ -157,7 +160,10 @@ def test_update_reference_control_with_urn(self, test):
                 "provider": "new " + REFERENCE_CONTROL_PROVIDER,
             },
             {
-                "folder": {"str": Folder.get_root_folder().name},
+                "folder": {
+                    "id": str(Folder.get_root_folder().id),
+                    "str": Folder.get_root_folder().name,
+                },
             },
             user_group=test.user_group,
             scope="Global",

backend/app_tests/api/test_api_threats.py

@@ -109,7 +109,10 @@ def test_get_threats(self, test):
                 "is_published": True,
             },
             {
-                "folder": {"str": Folder.get_root_folder().name},
+                "folder": {
+                    "id": str(Folder.get_root_folder().id),
+                    "str": Folder.get_root_folder().name,
+                },
             },
             user_group=test.user_group,
             scope="Global",

backend/ciso_assistant/settings.py

@@ -127,6 +127,7 @@ def set_ciso_assistant_url(_, __, event_dict):
     "tailwind",
     "iam",
     "global_settings",
+    "tprm",
     "core",
     "cal",
     "django_filters",

backend/core/helpers.py

@@ -12,6 +12,8 @@
 
 from typing import List, Dict, Optional
 
+import json
+
 from django.core.exceptions import NON_FIELD_ERRORS as DJ_NON_FIELD_ERRORS
 from django.core.exceptions import ValidationError as DjValidationError
 from rest_framework.exceptions import ValidationError as DRFValidationError