Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add the possibility to draft a risk acceptance #1285

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
+179 −43
Open

Add the possibility to draft a risk acceptance #1285

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
81db15b
feat: begin to add possibility to draft risk acceptances
Axxiar Dec 30, 2024
45f5ee2
dynamic translations
Axxiar Dec 30, 2024
352212b
fix: better ui + possibility to switch draft and submitted states
Axxiar Jan 2, 2025
e5f60a7
fix: removed backend translations
Axxiar Jan 3, 2025
faa6537
Merge branch 'main' into CA-729-add-the-possibility-to-draft-a-risk-a…
Axxiar Jan 20, 2025
a6b5118
fix: add possibility to remove the defined approver
Axxiar Jan 20, 2025
4c6a885
fix(api): prevent non-approvers to reject/revoke/accept
Axxiar Jan 20, 2025
f3f9eb6
fix(UI): tooltip instead of text for approver missing
Axxiar Jan 20, 2025
e42c45b
Merge branch 'main' into CA-729-add-the-possibility-to-draft-a-risk-a…
Axxiar Jan 27, 2025
5004d34
fix: coderabbits reviews
Axxiar Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/backend-linters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Install ruff
working-directory: ${{env.working-directory}}
run: |
python -m pip install ruff==0.9.1
python -m pip install ruff==0.9.2
- name: Run ruff format check
working-directory: ${{env.working-directory}}
run: ruff format --check .
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repos:
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.4.1
rev: v0.9.2
hooks:
# Run the linter.
# - id: ruff
Expand Down
10 changes: 5 additions & 5 deletions backend/core/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3410,11 +3410,11 @@ def save(self, *args, **kwargs) -> None:

class RiskAcceptance(NameDescriptionMixin, FolderMixin, PublishInRootFolderMixin):
ACCEPTANCE_STATE = [
("created", _("Created")),
("submitted", _("Submitted")),
("accepted", _("Accepted")),
("rejected", _("Rejected")),
("revoked", _("Revoked")),
("created", "Created"),
("submitted", "Submitted"),
("accepted", "Accepted"),
("rejected", "Rejected"),
("revoked", "Revoked"),
]

risk_scenarios = models.ManyToManyField(
Expand Down
62 changes: 45 additions & 17 deletions backend/core/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1654,23 +1654,54 @@ def to_review(self, request):

return Response({"results": acceptances})

@action(detail=True, methods=["post"], name="Submit risk acceptance")
def submit(self, request, pk):
if self.get_object().approver:
self.get_object().set_state("submitted")
return Response({"results": "state updated to submitted"})
else:
return Response(
{"error": "Missing 'approver' field"}, status=status.HTTP_403_FORBIDDEN
)

# This set back risk acceptance to "Created"
@action(detail=True, methods=["post"], name="Draft risk acceptance")
def draft(self, request, pk):
self.get_object().set_state("created")
return Response({"results": "state updated to submitted"})

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix the success message in the draft action.

The success message incorrectly states "state updated to submitted" when it should be "state updated to created".

Apply this diff to fix the message:

-        return Response({"results": "state updated to submitted"})
+        return Response({"results": "state updated to created"})
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
# This set back risk acceptance to "Created"
@action(detail=True, methods=["post"], name="Draft risk acceptance")
def draft(self, request, pk):
self.get_object().set_state("created")
return Response({"results": "state updated to submitted"})
# This set back risk acceptance to "Created"
@action(detail=True, methods=["post"], name="Draft risk acceptance")
def draft(self, request, pk):
self.get_object().set_state("created")
return Response({"results": "state updated to created"})

@action(detail=True, methods=["post"], name="Accept risk acceptance")
def accept(self, request, pk):
if request.user == self.get_object().approver:
self.get_object().set_state("accepted")
return Response({"results": "state updated to accepted"})
return Response({"results": "state updated to accepted"})
else:
return Response(
{"error": "only approver can accept a risk acceptance"},
status=status.HTTP_403_FORBIDDEN,
)

@action(detail=True, methods=["post"], name="Reject risk acceptance")
def reject(self, request, pk):
if request.user == self.get_object().approver:
self.get_object().set_state("rejected")
return Response({"results": "state updated to rejected"})
return Response({"results": "state updated to rejected"})
else:
return Response(
{"error": "only approver can reject a risk acceptance"},
status=status.HTTP_403_FORBIDDEN,
)

@action(detail=True, methods=["post"], name="Revoke risk acceptance")
def revoke(self, request, pk):
if request.user == self.get_object().approver:
self.get_object().set_state("revoked")
return Response({"results": "state updated to revoked"})
return Response({"results": "state updated to revoked"})
else:
return Response(
{"error": "only approver can revoke a risk acceptance"},
status=status.HTTP_403_FORBIDDEN,
)

@action(detail=False, methods=["get"], name="Get waiting risk acceptances")
def waiting(self, request):
Expand All @@ -1679,23 +1710,20 @@ def waiting(self, request):
).count()
return Response({"count": acceptance_count})

def perform_create(self, serializer):
def perform_update(self, serializer):
risk_acceptance = serializer.validated_data
submitted = False

if risk_acceptance.get("approver"):
submitted = True
for scenario in risk_acceptance.get("risk_scenarios"):
if not RoleAssignment.is_access_allowed(
risk_acceptance.get("approver"),
Permission.objects.get(codename="approve_riskacceptance"),
scenario.risk_assessment.project.folder,
):
raise ValidationError(
"The approver is not allowed to approve this risk acceptance"
)
for scenario in risk_acceptance.get("risk_scenarios"):
if not RoleAssignment.is_access_allowed(
risk_acceptance.get("approver"),
Permission.objects.get(codename="approve_riskacceptance"),
scenario.risk_assessment.project.folder,
):
raise ValidationError(
"The approver is not allowed to approve this risk acceptance"
)
risk_acceptance = serializer.save()
if submitted:
risk_acceptance.set_state("submitted")


class UserFilter(df.FilterSet):
Expand Down
2 changes: 1 addition & 1 deletion frontend/messages/ar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@
"enterYourEmail": "أدخل عنوان بريدك الإلكتروني أدناه، وسنرسل لك تعليمات لتعيين كلمة مرور جديدة",
"send": "إرسال",
"goBackToLogin": "العودة إلى تسجيل الدخول",
"riskAcceptanceReviewMessage": "هذا القبول للمخاطر بانتظار المعالجة. تذكر مراجعته قبل الموافقة أو الرفض، لن تتمكن من العودة.",
"riskAcceptanceValidatingReviewMessage": "هذا القبول للمخاطر بانتظار المعالجة. تذكر مراجعته قبل الموافقة أو الرفض، لن تتمكن من العودة.",
"validate": "تحقق",
"reject": "رفض",
"revoke": "إلغاء",
Expand Down
2 changes: 1 addition & 1 deletion frontend/messages/cs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@
"enterYourEmail": "Zadejte svou e-mailovou adresu níže a zašleme vám instrukce pro nastavení nového hesla",
"send": "Odeslat",
"goBackToLogin": "Vrátit se k přihlášení",
"riskAcceptanceReviewMessage": "Toto přijetí rizika čeká na zpracování. Nezapomeňte jej před schválením nebo odmítnutím zkontrolovat, později už to nebudete moci změnit.",
"riskAcceptanceValidatingReviewMessage": "Toto přijetí rizika čeká na zpracování. Nezapomeňte jej před schválením nebo odmítnutím zkontrolovat, později už to nebudete moci změnit.",
"validate": "Ověřit",
"reject": "Odmítnout",
"revoke": "Odebrat",
Expand Down
2 changes: 1 addition & 1 deletion frontend/messages/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@
"enterYourEmail": "Geben Sie unten Ihre E-Mail-Adresse ein, und wir senden Ihnen Anweisungen zum Festlegen eines neuen Passworts",
"send": "Senden",
"goBackToLogin": "Zurück zur Anmeldung",
"riskAcceptanceReviewMessage": "Diese Risikoakzeptanz wartet auf die Bearbeitung. Denken Sie daran, sie zu überprüfen, bevor Sie sie validieren oder ablehnen, Sie können nicht zurückgehen.",
"riskAcceptanceValidatingReviewMessage": "Diese Risikoakzeptanz wartet auf die Bearbeitung. Denken Sie daran, sie zu überprüfen, bevor Sie sie validieren oder ablehnen, Sie können nicht zurückgehen.",
"validate": "Validieren",
"reject": "Ablehnen",
"revoke": "Widerrufen",
Expand Down
6 changes: 5 additions & 1 deletion frontend/messages/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@
"acceptedAt": "Accepted at",
"rejectedAt": "Rejected at",
"revokedAt": "Revoked at",
"created": "Created",
"submitted": "Submitted",
"rejected": "Rejected",
"revoked": "Revoked",
Expand Down Expand Up @@ -456,14 +457,17 @@
"enterYourEmail": "Enter your email address below, and we'll send instructions for setting a new one",
"send": "Send",
"goBackToLogin": "Go back to login",
"riskAcceptanceReviewMessage": "This risk acceptance is awaiting processing. Remember to review it before validating or rejecting it, you will not be able to go back.",
"riskAcceptanceSubmittingReviewMessage": "This will be sent to the approver for validation.",
"riskAcceptanceValidatingReviewMessage": "This risk acceptance is awaiting processing. Remember to review it before validating or rejecting it, you will not be able to go back.",
"riskAcceptanceMissingApproverMessage": "Approver required before submitting.",
"validate": "Validate",
"reject": "Reject",
"revoke": "Revoke",
"riskAcceptanceValidatedMessage": "This risk acceptance is currently validated. It can be revoked at any time, but this will be irrevocable. You will need to duplicate it with a different version if necessary.",
"confirmModalTitle": "Confirm",
"confirmModalMessage": "Are you sure? This action will permanently affect the following object",
"submit": "Submit",
"draft": "Draft",
"requirementAssessment": "Requirement assessment",
"requirementAssessments": "Requirement assessments",
"deleteModalTitle": "Delete",
Expand Down
2 changes: 1 addition & 1 deletion frontend/messages/es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@
"enterYourEmail": "Ingrese su dirección de correo electrónico a continuación y le enviaremos instrucciones para establecer una nueva",
"send": "Enviar",
"goBackToLogin": "Volver al inicio de sesión",
"riskAcceptanceReviewMessage": "Esta aceptación de riesgo está pendiente de procesamiento. Recuerde revisarla antes de validarla o rechazarla, no podrá volver atrás.",
"riskAcceptanceValidatingReviewMessage": "Esta aceptación de riesgo está pendiente de procesamiento. Recuerde revisarla antes de validarla o rechazarla, no podrá volver atrás.",
"validate": "Validar",
"reject": "Rechazar",
"revoke": "Revocar",
Expand Down
4 changes: 2 additions & 2 deletions frontend/messages/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@
"acceptedAt": "Accepté le",
"rejectedAt": "Rejeté le",
"revokedAt": "Révoqué le",
"created": "Créé",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Add missing translations for new English messages.

The following messages are present in English but missing in German and French:

  • "created": "Created"
  • "riskAcceptanceSubmittingReviewMessage": "This will be sent to the approver for validation."
  • "riskAcceptanceMissingApproverMessage": "Approver required before submitting."

Please add the corresponding translations to maintain consistency across all language files.

Also applies to: 460-462

"submitted": "Soumis",
"rejected": "Rejeté",
"revoked": "Révoqué",
Expand Down Expand Up @@ -456,7 +457,7 @@
"enterYourEmail": "Entrez votre adresse e-mail ci-dessous et nous vous enverrons des instructions pour en définir un nouveau",
"send": "Envoyer",
"goBackToLogin": "Revenir à la page de connexion",
"riskAcceptanceReviewMessage": "Cette acceptation de risque est en attente de traitement. Pensez à la consulter avant de la valider ou de la rejeter, vous ne pourrez pas revenir en arrière.",
"riskAcceptanceValidatingReviewMessage": "Cette acceptation de risque est en attente de traitement. Pensez à la consulter avant de la valider ou de la rejeter, vous ne pourrez pas revenir en arrière.",
"validate": "Valider",
"reject": "Rejeter",
"revoke": "Révoquer",
Expand All @@ -473,7 +474,6 @@
"loading": "Chargement",
"open": "Ouvert",
"mitigate": "Atténué",
"accept": "Accepté",
"avoid": "Refusé",
"transfer": "Partagé",
"primary": "Primaire",
Expand Down
2 changes: 1 addition & 1 deletion frontend/messages/hi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@
"enterYourEmail": "नीचे अपना ईमेल पता दर्ज करें, और हम आपको नया पासवर्ड सेट करने के निर्देश भेजेंगे",
"send": "भेजें",
"goBackToLogin": "लॉगिन पर वापस जाएं",
"riskAcceptanceReviewMessage": "यह जोखिम स्वीकृति प्रसंस्करण के लिए प्रतीक्षारत है। इसे मान्य करने या अस्वीकार करने से पहले इसकी समीक्षा करना याद रखें, आप वापस नहीं जा सकेंगे।",
"riskAcceptanceValidatingReviewMessage": "यह जोखिम स्वीकृति प्रसंस्करण के लिए प्रतीक्षारत है। इसे मान्य करने या अस्वीकार करने से पहले इसकी समीक्षा करना याद रखें, आप वापस नहीं जा सकेंगे।",
"validate": "मान्य करें",
"reject": "अस्वीकार करें",
"revoke": "रद्द करें",
Expand Down
2 changes: 1 addition & 1 deletion frontend/messages/it.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@
"enterYourEmail": "Inserisci il tuo indirizzo email per ricevere le istruzioni per impostare una nuova password",
"send": "Invia",
"goBackToLogin": "Torna al login",
"riskAcceptanceReviewMessage": "L'accettazione di questo rischio è in valutazione. Ricordati di revisionarla con attenzione prima di convalidarla o/o rifiutarla. Dopo l'accettazione o il rigiuto non sarà possibile tornare indietro.",
"riskAcceptanceValidatingReviewMessage": "L'accettazione di questo rischio è in valutazione. Ricordati di revisionarla con attenzione prima di convalidarla o/o rifiutarla. Dopo l'accettazione o il rigiuto non sarà possibile tornare indietro.",
"validate": "Convalida",
"reject": "Rifiuta",
"revoke": "Revoca",
Expand Down
2 changes: 1 addition & 1 deletion frontend/messages/nl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@
"enterYourEmail": "Voer hieronder je e-mailadres in, en we sturen instructies om een nieuw wachtwoord in te stellen",
"send": "Versturen",
"goBackToLogin": "Ga terug naar inloggen",
"riskAcceptanceReviewMessage": "Deze risicoacceptatie wacht op verwerking. Vergeet niet deze te beoordelen voordat je deze valideert of afwijst, je kunt niet meer terug.",
"riskAcceptanceValidatingReviewMessage": "Deze risicoacceptatie wacht op verwerking. Vergeet niet deze te beoordelen voordat je deze valideert of afwijst, je kunt niet meer terug.",
"validate": "Valideren",
"reject": "Afwijzen",
"revoke": "Intrekken",
Expand Down
2 changes: 1 addition & 1 deletion frontend/messages/pl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@
"enterYourEmail": "Wpisz swój adres e-mail poniżej, a wyślemy instrukcje dotyczące ustawienia nowego hasła",
"send": "Wyślij",
"goBackToLogin": "Wróć do logowania",
"riskAcceptanceReviewMessage": "Ta akceptacja ryzyka oczekuje na przetworzenie. Pamiętaj, aby ją przejrzeć przed zatwierdzeniem lub odrzuceniem, nie będzie można wrócić.",
"riskAcceptanceValidatingReviewMessage": "Ta akceptacja ryzyka oczekuje na przetworzenie. Pamiętaj, aby ją przejrzeć przed zatwierdzeniem lub odrzuceniem, nie będzie można wrócić.",
"validate": "Zatwierdź",
"reject": "Odrzuć",
"revoke": "Cofnij",
Expand Down
2 changes: 1 addition & 1 deletion frontend/messages/pt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@
"enterYourEmail": "Digite seu endereço de e-mail abaixo e enviaremos instruções para definir uma nova senha",
"send": "Enviar",
"goBackToLogin": "Voltar para o login",
"riskAcceptanceReviewMessage": "Esta aceitação de risco está aguardando processamento. Lembre-se de revisá-la antes de validá-la ou rejeitá-la, pois você não poderá voltar atrás.",
"riskAcceptanceValidatingReviewMessage": "Esta aceitação de risco está aguardando processamento. Lembre-se de revisá-la antes de validá-la ou rejeitá-la, pois você não poderá voltar atrás.",
"validate": "Validar",
"reject": "Rejeitar",
"revoke": "Revogar",
Expand Down
2 changes: 1 addition & 1 deletion frontend/messages/ro.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@
"enterYourEmail": "Introduceți adresa dvs. de e-mail mai jos și vă vom trimite instrucțiuni pentru a seta una nouă",
"send": "Trimite",
"goBackToLogin": "Înapoi la autentificare",
"riskAcceptanceReviewMessage": "Această acceptare a riscului așteaptă procesarea. Amintiți-vă să o revizuiți înainte de a o valida sau respinge, nu veți putea reveni.",
"riskAcceptanceValidatingReviewMessage": "Această acceptare a riscului așteaptă procesarea. Amintiți-vă să o revizuiți înainte de a o valida sau respinge, nu veți putea reveni.",
"validate": "Validați",
"reject": "Respingeți",
"revoke": "Revocați",
Expand Down
2 changes: 1 addition & 1 deletion frontend/messages/sv.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@
"enterYourEmail": "Ange din e-postadress nedan, så skickar vi instruktioner för att ställa in ett nytt",
"send": "Skicka",
"goBackToLogin": "Gå tillbaka till inloggning",
"riskAcceptanceReviewMessage": "Denna riskacceptans väntar på bearbetning. Kom ihåg att granska den innan du validerar eller avvisar den; du kommer inte att kunna ångra dig.",
"riskAcceptanceValidatingReviewMessage": "Denna riskacceptans väntar på bearbetning. Kom ihåg att granska den innan du validerar eller avvisar den; du kommer inte att kunna ångra dig.",
"validate": "Validera",
"reject": "Avvisa",
"revoke": "Återkalla",
Expand Down
2 changes: 1 addition & 1 deletion frontend/messages/ur.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@
"enterYourEmail": "نیچے اپنا ای میل پتہ درج کریں، اور ہم آپ کو نیا پاس ورڈ سیٹ کرنے کے لیے ہدایات بھیجیں گے",
"send": "بھیجیں",
"goBackToLogin": "لاگ ان پر واپس جائیں",
"riskAcceptanceReviewMessage": "یہ خطرے کی منظوری کارروائی کے لیے زیر التواء ہے۔ اسے درست کرنے یا مسترد کرنے سے پہلے اس کا جائزہ لینا یاد رکھیں، آپ واپس نہیں جا سکیں گے۔",
"riskAcceptanceValidatingReviewMessage": "یہ خطرے کی منظوری کارروائی کے لیے زیر التواء ہے۔ اسے درست کرنے یا مسترد کرنے سے پہلے اس کا جائزہ لینا یاد رکھیں، آپ واپس نہیں جا سکیں گے۔",
"validate": "درست کریں",
"reject": "مسترد کریں",
"revoke": "منسوخ کریں",
Expand Down
Loading
Loading