Skip to content

Commit

Permalink
Fix duplicate report_id generation (#4681)
Browse files Browse the repository at this point in the history
* Initial commit

* FE Linting
  • Loading branch information
rnovak338 authored Feb 7, 2025
1 parent d122cc5 commit e517d56
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@
</fieldset>
<ul class="usa-button-group">
<li class="usa-button-group__item">
<button class="usa-button" id="create">
<button class="usa-button" id="create" type="button">
Save and create audit
</button>
</li>
Expand Down
24 changes: 14 additions & 10 deletions backend/report_submission/views.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import logging
from datetime import datetime

from django.db import transaction
from django.contrib.auth.mixins import LoginRequiredMixin
from django.core.exceptions import BadRequest, PermissionDenied, ValidationError
from django.shortcuts import render, redirect
Expand Down Expand Up @@ -118,18 +119,21 @@ def get(self, request):
return render(request, "report_submission/step-3.html", args)

def post(self, request):
result = api.views.access_and_submission_check(request.user, request.POST)

report_id = result.get("report_id")
with transaction.atomic():

if report_id:
return Util.validate_redirect_url(
f"/report_submission/general-information/{report_id}"
)
else:
return render(
request, "report_submission/step-3.html", context=result, status=400
)
result = api.views.access_and_submission_check(request.user, request.POST)

report_id = result.get("report_id")

if report_id:
return Util.validate_redirect_url(
f"/report_submission/general-information/{report_id}"
)
else:
return render(
request, "report_submission/step-3.html", context=result, status=400
)


class GeneralInformationFormView(LoginRequiredMixin, View):
Expand Down
14 changes: 5 additions & 9 deletions backend/static/js/check-access.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
import { checkValidity } from './validate';

const FORM = document.forms[0];
let addedContactNum = 1;

function setFormDisabled(shouldDisable) {
const continueBtn = document.getElementById('create');
continueBtn.disabled = shouldDisable;
}

function allResponsesValid() {
const inputsWithErrors = document.querySelectorAll('[class *="-error"]');
return inputsWithErrors.length === 0;
}

function performValidations(nodes) {
const errors = Array.from(nodes).filter((field) => {
return checkValidity(field).length > 0;
Expand Down Expand Up @@ -91,10 +85,12 @@ function attachFocusoutMulti(elements) {
}

function attachEventHandlers() {
FORM.addEventListener('submit', (e) => {

const continueBtn = document.getElementById('create');
continueBtn.addEventListener('click', (e) => {
e.preventDefault();
if (!allResponsesValid()) return;
FORM.submit();
setFormDisabled(true);
document.getElementById('grant-access').submit();
});

const certifyingInputs = Array.from(
Expand Down

0 comments on commit e517d56

Please sign in to comment.