Merge branch 'main' into CA-519-Move-from-localItems-to-safeTranslate…

…-to-translate-dynamic-strings

.github/workflows/backend-migrations-check.yaml

@@ -0,0 +1,108 @@
+name: Backend migrations check
+
+on:
+  pull_request:
+    branches: [main, develop]
+    types: [opened, synchronize]
+  workflow_dispatch:
+
+env:
+  GITHUB_WORKFLOW: github_actions
+  backend-directory: ./backend
+  enterprise-backend-directory: ./enterprise/backend
+  enterprise-backend-settings-module: enterprise_core.settings
+
+jobs:
+  migrations-check:
+    runs-on: ubuntu-20.04
+
+    strategy:
+      max-parallel: 4
+      matrix:
+        python-version: ["3.11"]
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: "pip"
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+      - name: Install requirements
+        working-directory: ${{ env.backend-directory }}
+        run: |
+          python -m pip install --upgrade pip
+          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+      - name: Create backend environment variables file
+        working-directory: ${{ env.backend-directory }}
+        run: |
+          touch .env
+          echo DJANGO_DEBUG=True >> .env
+          echo [email protected] >> .env
+          echo DJANGO_SUPERUSER_PASSWORD=1234 >> .env
+          echo DB_HOST=localhost >> .env
+          echo CISO_ASSISTANT_SUPERUSER_EMAIL='' >> .env
+          echo CISO_ASSISTANT_URL=http://localhost:4173 >> .env
+          echo DEFAULT_FROM_EMAIL='[email protected]' >> .env
+          echo EMAIL_HOST=localhost >> .env
+          echo [email protected] >> .env
+          echo EMAIL_HOST_PASSWORD=password >> .env
+          echo EMAIL_PORT=1025 >> .env
+      - name: Check that migrations were made
+        working-directory: ${{ env.backend-directory }}
+        run: |
+          export $(grep -v '^#' .env | xargs)
+          python manage.py makemigrations --check --dry-run --verbosity=3
+
+  enterprise-migrations-check:
+    runs-on: ubuntu-20.04
+
+    strategy:
+      max-parallel: 4
+      matrix:
+        python-version: ["3.11"]
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: "pip"
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+        with:
+          virtualenvs-create: false
+          installer-parallel: true
+      - name: Install backend requirements
+        working-directory: ${{ env.backend-directory }}
+        run: poetry install
+      - name: Install enterprise backend
+        working-directory: ${{ env.enterprise-backend-directory }}
+        run: poetry install
+      - name: Create backend environment variables file
+        working-directory: ${{ env.backend-directory }}
+        run: |
+          touch .env
+          echo DJANGO_DEBUG=True >> .env
+          echo [email protected] >> .env
+          echo DJANGO_SUPERUSER_PASSWORD=1234 >> .env
+          echo DB_HOST=localhost >> .env
+          echo CISO_ASSISTANT_SUPERUSER_EMAIL='' >> .env
+          echo CISO_ASSISTANT_URL=http://localhost:4173 >> .env
+          echo DEFAULT_FROM_EMAIL='[email protected]' >> .env
+          echo EMAIL_HOST=localhost >> .env
+          echo [email protected] >> .env
+          echo EMAIL_HOST_PASSWORD=password >> .env
+          echo EMAIL_PORT=1025 >> .env
+          echo DJANGO_SETTINGS_MODULE=enterprise_core.settings >> .env
+          echo LICENSE_SEATS=999 >> .env
+      - name: Check that migrations were made
+        working-directory: ${{ env.backend-directory }}
+        run: |
+          export $(grep -v '^#' .env | xargs)
+          poetry run python manage.py makemigrations --check --dry-run --verbosity=3 --settings=${{ env.enterprise-backend-settings-module }}
+          if [ $? -ne 0 ]; then echo "::error Migrations were not made, please run the makemigrations command." && exit 1; fi

.gitignore

@@ -6,7 +6,7 @@
 *.sqlite3
 django_secret_key
 temp/
-db/
+./db/
 .dccache
 /backend/profiles
 ./backend/ciso_assistant/.meta

backend/core/startup.py

@@ -369,7 +369,7 @@ def startup(sender: AppConfig, **kwargs):
             name="Global", content_type=Folder.ContentType.ROOT, builtin=True
         )
     # if main entity does not exist, then create it
-    if not Entity.objects.filter(name="Main").exists():
+    if not Entity.get_main_entity():
         main = Entity.objects.create(
             name="Main", folder=Folder.get_root_folder(), builtin=True
         )

backend/core/utils.py

@@ -65,6 +65,10 @@ def __str__(self) -> str:
     str(UserGroupCodename.THIRD_PARTY_RESPONDENT): _("Third-party respondent"),
 }
 
+# NOTE: This is set to "Main" now, but will be changed to a unique identifier
+# for internationalization.
+MAIN_ENTITY_DEFAULT_NAME = "Main"
+
 COUNTRY_FLAGS = {
     "fr": "🇫🇷",
     "en": "🇬🇧",

backend/tprm/models.py

@@ -2,7 +2,7 @@
 from django.utils.translation import gettext_lazy as _
 from core.base_models import NameDescriptionMixin, AbstractBaseModel
 from core.models import Assessment, ComplianceAssessment, Evidence
-from iam.models import FolderMixin, PublishInRootFolderMixin
+from iam.models import Folder, FolderMixin, PublishInRootFolderMixin
 from iam.views import User
 
 
@@ -27,6 +27,15 @@ class Meta:
         verbose_name = _("Entity")
         verbose_name_plural = _("Entities")
 
+    @classmethod
+    def get_main_entity(cls):
+        return (
+            cls.objects.filter(builtin=True)
+            .filter(owned_folders=Folder.get_root_folder())
+            .order_by("created_at")
+            .first()
+        )
+
 
 class EntityAssessment(Assessment):
     class Conclusion(models.TextChoices):

enterprise/README.md

@@ -33,7 +33,7 @@ cd ../backend
 poetry shell
 ```
 
-3. Install enterprise backend module
+3. Install enterprise backend module.
 
 ```sh
 cd ../enterprise/backend
@@ -46,21 +46,33 @@ poetry install
 export SQLITE_FILE=db/ciso-assistant-enterprise.sqlite3
 ```
 
-5. Run the development server
+5. Apply migrations.
+
+```sh
+poetry run ./manage.sh migrate
+```
+
+6. Create a Django superuser, that will be CISO Assistant administrator.
+
+```sh
+poetry run ./manage.sh createsuperuser
+```
+
+7. Run the development server.
 
 ```sh
 poetry run ./manage.sh runserver
 ```
 
 ### Running the frontend
 
-1. cd into the enteprise frontend directory
+1. cd into the enteprise frontend directory.
 
 ```bash
 cd enterprise/frontend
 ```
 
-3. Start a development server (make sure that the django app is running)
+3. Start a development server (make sure that the django app is running).
 
 ```bash
 make dev

enterprise/backend/db/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

enterprise/backend/enterprise_core/views.py

@@ -14,7 +14,9 @@
 from django.conf import settings
 
 from core.views import BaseModelViewSet
+from core.utils import MAIN_ENTITY_DEFAULT_NAME
 from iam.models import User
+from tprm.models import Entity
 
 from .models import ClientSettings
 from .serializers import ClientSettingsReadSerializer
@@ -39,6 +41,31 @@ def delete(self, request, *args, **kwargs):
             status=status.HTTP_405_METHOD_NOT_ALLOWED,
         )
 
+    def perform_update(self, serializer):
+        instance = serializer.save()
+        self._update_main_entity_name(instance)
+
+    def _update_main_entity_name(self, instance):
+        main_entity = Entity.get_main_entity()
+
+        if instance.name:
+            self._set_main_entity_name(main_entity, instance.name)
+        elif main_entity.name != MAIN_ENTITY_DEFAULT_NAME:
+            self._set_main_entity_name(main_entity, MAIN_ENTITY_DEFAULT_NAME)
+
+    def _set_main_entity_name(self, main_entity, new_name):
+        if main_entity.name == new_name:
+            return
+
+        logger.info("Updating main entity name", entity=main_entity, name=new_name)
+        try:
+            main_entity.name = new_name
+            main_entity.save()
+            logger.info("Main entity name updated", entity=main_entity, name=new_name)
+        except Exception as e:
+            logger.error("An error occurred while renaming main entity", exc_info=e)
+            raise
+
     @action(methods=["get"], detail=False, permission_classes=[AllowAny])
     def info(self, request):
         try:

frontend/src/lib/components/DetailView/DetailView.svelte

@@ -150,20 +150,6 @@
 		modalStore.trigger(modal);
 	}
 
-	function getForms(model: Record<string, any>) {
-		let { form: createForm, message: createMessage } = superForm(model.createForm, {
-			onUpdated: ({ form }) =>
-				handleFormUpdated({ form, pageStatus: $page.status, closeModal: true })
-		});
-		let { form: deleteForm, message: deleteMessage } = superForm(model.deleteForm, {
-			onUpdated: ({ form }) =>
-				handleFormUpdated({ form, pageStatus: $page.status, closeModal: true })
-		});
-		return { createForm, createMessage, deleteForm, deleteMessage };
-	}
-
-	let forms: Record<string, any> = {};
-
 	const user = $page.data.user;
 	const canEditObject: boolean = Object.hasOwn(user.permissions, `change_${data.model.name}`);
 
@@ -175,9 +161,6 @@
 			!data.data.builtin
 		);
 	};
-	$: Object.entries(data.relatedModels).forEach(([key, value]) => {
-		forms[key] = getForms(value);
-	});
 </script>
 
 <div class="flex flex-col space-y-2">

frontend/src/lib/components/Forms/Question.svelte

@@ -42,6 +42,7 @@
 					<RadioGroup active="variant-filled-primary" hover="hover:variant-soft-primary">
 						{#each question.options as option}
 							<RadioItem
+								class="whitespace-nowrap"
 								bind:group={question.answer}
 								name="question"
 								value={option}

frontend/src/lib/utils/table.ts

@@ -361,6 +361,7 @@ export const listViewFields: ListViewFieldsConfig = {
 		filters: {
 			folder: { ...DOMAIN_FILTER, alwaysDisplay: true },
 			category: CATEGORY_FILTER,
+			provider: PROVIDER_FILTER,
 			csf_function: CSF_FUNCTION_FILTER
 		}
 	},

frontend/src/routes/(app)/(internal)/analytics/+page.svelte

@@ -532,7 +532,7 @@
 									<div class="absolute top-2 right-4 mt-2 space-x-1">
 										<div class="flex flex-col space-y-1">
 											<a
-												href="/compliance-assessments/{compliance_assessment.id}/edit"
+												href="/compliance-assessments/{compliance_assessment.id}/edit?next=/analytics?tab=3"
 												class="btn variant-filled-primary"
 												><i class="fa-solid fa-edit mr-2" /> {m.edit()}
 											</a>

frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/TreeViewItemContent.svelte

@@ -155,7 +155,7 @@
 							{/if}
 						{/each}
 					{/if}
-					{#if node.question.questions}
+					{#if node.question && node.question.questions}
 						<span class="badge" style="background-color: pink; color: {darkenColor('#FFC0CB', 0.5)}"
 							>{node.question.questions.length} {m.questionOrQuestions()}</span
 						>

frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/table-mode/+page.svelte

@@ -299,7 +299,7 @@
 						{/if}
 						<div class="flex flex-col w-full place-items-center">
 							<Accordion regionCaret="flex">
-								<AccordionItem>
+								<AccordionItem caretOpen="rotate-0" caretClosed="-rotate-90">
 									<svelte:fragment slot="summary"
 										><p class="flex">{m.observation()}</p></svelte:fragment
 									>
@@ -348,7 +348,7 @@
 										</div>
 									</svelte:fragment>
 								</AccordionItem>
-								<AccordionItem>
+								<AccordionItem caretOpen="rotate-0" caretClosed="-rotate-90">
 									<svelte:fragment slot="summary"
 										><p class="flex items-center space-x-2">
 											<span>{m.evidence()}</span>