From d36bbdffa86acfef3e7edbfec9f4bd76813601c2 Mon Sep 17 00:00:00 2001 From: jason Date: Sun, 8 Mar 2026 07:51:15 -0700 Subject: [PATCH 01/10] Issue #1052: tag manage modal read-only footer actions - Add to Delete case button in modal footer. - Add to Close/Reopen case buttons for shared edit-mode toggling. - Add to Reopen case to keep left-side alignment consistent with Close case. --- .../pages/manage/templates/modal_case_info_from_case.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/app/blueprints/pages/manage/templates/modal_case_info_from_case.html b/source/app/blueprints/pages/manage/templates/modal_case_info_from_case.html index f0dcd9504..baf56e109 100644 --- a/source/app/blueprints/pages/manage/templates/modal_case_info_from_case.html +++ b/source/app/blueprints/pages/manage/templates/modal_case_info_from_case.html @@ -394,14 +394,14 @@
Protagonist
- {% if not data.close_date %} - {% else %} - {% endif %} From 4bcb174321e0f78dabd7e24834581a0eaa1c5e99 Mon Sep 17 00:00:00 2001 From: jason Date: Sun, 8 Mar 2026 07:51:25 -0700 Subject: [PATCH 02/10] Issue #1052: hide read-only case actions while editing - Hide '.case-info-readonly-action' in edit_case_info() so only Save/Cancel remain during edits. - Show '.case-info-readonly-action' in cancel_case_edit() when returning to read-only mode. - Preserve existing Save/Cancel visibility behavior and only adjust footer action toggling. --- ui/src/pages/manage.cases.common.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ui/src/pages/manage.cases.common.js b/ui/src/pages/manage.cases.common.js index 64c893033..17c35cac8 100644 --- a/ui/src/pages/manage.cases.common.js +++ b/ui/src/pages/manage.cases.common.js @@ -107,6 +107,7 @@ function remove_case(id) { function edit_case_info() { $('#case_gen_info_content').hide(); $('#case_gen_info_edit').show(); + $('.case-info-readonly-action').hide(); $('#cancel_case_info').show(); $('#save_case_info').show(); $('#case_info').hide(); @@ -115,6 +116,7 @@ function edit_case_info() { function cancel_case_edit() { $('#case_gen_info_content').show(); $('#case_gen_info_edit').hide(); + $('.case-info-readonly-action').show(); $('#cancel_case_info').hide(); $('#save_case_info').hide(); $('#case_info').show(); @@ -381,4 +383,4 @@ function remove_cases_access_user(user_id, cases, on_finish) { } }); -} \ No newline at end of file +} From 0cec5b597c4f507b9dccd76aa3878318f7c813e8 Mon Sep 17 00:00:00 2001 From: jason Date: Sun, 8 Mar 2026 08:46:07 -0700 Subject: [PATCH 03/10] [#1050][IMP] Preserve selected state when reopening a case - Extend reopen_case() with an optional state_id argument. - Keep legacy behavior by defaulting to the Open state when state_id is not provided. - Allow caller paths that reopen from Closed via state change to retain the selected non-Closed state. --- source/app/datamgmt/manage/manage_cases_db.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/source/app/datamgmt/manage/manage_cases_db.py b/source/app/datamgmt/manage/manage_cases_db.py index 91840f886..fb13256a2 100644 --- a/source/app/datamgmt/manage/manage_cases_db.py +++ b/source/app/datamgmt/manage/manage_cases_db.py @@ -222,7 +222,7 @@ def map_alert_resolution_to_case_status(case_status_id): return None -def reopen_case(case_id): +def reopen_case(case_id, state_id=None): res = Cases.query.filter( Cases.case_id == case_id ).first() @@ -230,7 +230,10 @@ def reopen_case(case_id): if res: res.close_date = None - res.state_id = get_case_state_by_name('Open').state_id + if state_id is None: + state_id = get_case_state_by_name('Open').state_id + + res.state_id = state_id db.session.commit() return res From 69ada657b7a52b2b19248cc57398d723fedd6245 Mon Sep 17 00:00:00 2001 From: jason Date: Sun, 8 Mar 2026 08:46:15 -0700 Subject: [PATCH 04/10] [#1049][#1050][IMP] Fix Closed-state transition detection in cases_update - Add a previous_state_id parameter to cases_update() for reliable transition comparison. - Use the captured pre-load state instead of a potentially mutated SQLAlchemy instance state. - Reopen through reopen_case(case_id, updated_state_id) so state transitions out of Closed clear close_date without forcing Open. --- source/app/business/cases.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/app/business/cases.py b/source/app/business/cases.py index 5ffc80433..a60182890 100644 --- a/source/app/business/cases.py +++ b/source/app/business/cases.py @@ -161,10 +161,10 @@ def cases_delete(case_identifier): raise BusinessProcessingError('Cannot delete the case. Please check server logs for additional informations') -def cases_update(case: Cases, updated_case, protagonists, tags) -> Cases: +def cases_update(case: Cases, updated_case, protagonists, tags, previous_state_id=None) -> Cases: try: closed_state_id = get_case_state_by_name('Closed').state_id - previous_case_state = case.state_id + previous_case_state = case.state_id if previous_state_id is None else previous_state_id case_previous_reviewer_id = case.reviewer_id db.session.commit() @@ -198,7 +198,7 @@ def cases_update(case: Cases, updated_case, protagonists, tags) -> Cases: elif previous_case_state == closed_state_id and updated_case.state_id != closed_state_id: track_activity('case re-opened', caseid=case.case_id) - res = reopen_case(case.case_id) + res = reopen_case(case.case_id, updated_case.state_id) if not res: raise BusinessProcessingError('Tried to re-open an non-existing case') From b157278aa3aef5c22db078644f4aa06cc4caa0c4 Mon Sep 17 00:00:00 2001 From: jason Date: Sun, 8 Mar 2026 08:46:23 -0700 Subject: [PATCH 05/10] [#1049][#1050][IMP] Pass pre-update state into manage case update flow - Capture previous_state_id before CaseSchema.load() mutates the case instance. - Forward previous_state_id into cases_update() for accurate Closed enter/exit detection. - Ensure /manage/cases/update uses the same transition semantics as the business layer fix. --- source/app/blueprints/rest/manage/manage_cases_routes.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/app/blueprints/rest/manage/manage_cases_routes.py b/source/app/blueprints/rest/manage/manage_cases_routes.py index a68de7505..b14a22ea5 100644 --- a/source/app/blueprints/rest/manage/manage_cases_routes.py +++ b/source/app/blueprints/rest/manage/manage_cases_routes.py @@ -278,6 +278,7 @@ def update_case_info(identifier): case_schema = CaseSchema() try: case = cases_get_by_identifier(identifier) + previous_state_id = case.state_id request_data = request.get_json() # If user tries to update the customer, check if the user has access to the new customer @@ -296,7 +297,7 @@ def update_case_info(identifier): protagonists = request_data.get('protagonists') tags = request_data.get('case_tags') - case = cases_update(case, updated_case, protagonists, tags) + case = cases_update(case, updated_case, protagonists, tags, previous_state_id=previous_state_id) return response_success('Updated', data=case_schema.dump(case)) except ValidationError as e: return response_error('Data error', e.messages) From 257db9c502db0aa8bd478108951b15ef45bbaf8c Mon Sep 17 00:00:00 2001 From: jason Date: Sun, 8 Mar 2026 08:46:31 -0700 Subject: [PATCH 06/10] [#1049][#1050][IMP] Pass pre-update state into v2 case update flow - Capture previous_state_id before schema load mutates the tracked case entity. - Propagate previous_state_id to cases_update() for deterministic Closed transition handling. - Keep v2 API behavior aligned with manage update behavior for lifecycle fields. --- source/app/blueprints/rest/v2/cases.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/app/blueprints/rest/v2/cases.py b/source/app/blueprints/rest/v2/cases.py index 9d9b7c5ba..2dc5b113a 100644 --- a/source/app/blueprints/rest/v2/cases.py +++ b/source/app/blueprints/rest/v2/cases.py @@ -129,6 +129,7 @@ def update(self, identifier): try: case = cases_get_by_identifier(identifier) + previous_state_id = case.state_id request_data = request.get_json() @@ -151,7 +152,7 @@ def update(self, identifier): protagonists = request_data.get('protagonists') tags = request_data.get('case_tags') - case = cases_update(case, updated_case, protagonists, tags) + case = cases_update(case, updated_case, protagonists, tags, previous_state_id=previous_state_id) result = self._schema.dump(case) return response_api_success(result) except ValidationError as e: From 53552c747494a2679c0750f30d762ea4eecba821 Mon Sep 17 00:00:00 2001 From: jason Date: Sun, 8 Mar 2026 08:46:35 -0700 Subject: [PATCH 07/10] [#1049][#1050][IMP] Pass pre-update state into GraphQL case mutation - Capture previous_state_id before loading mutation payload into the case model. - Forward previous_state_id to cases_update() so Closed transitions are handled identically. - Prevent GraphQL from diverging from REST lifecycle behavior on state changes. --- source/app/blueprints/graphql/cases.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/app/blueprints/graphql/cases.py b/source/app/blueprints/graphql/cases.py index 255b7e718..3e14772c6 100644 --- a/source/app/blueprints/graphql/cases.py +++ b/source/app/blueprints/graphql/cases.py @@ -181,6 +181,7 @@ def mutate(root, info, case_id, name=None, soc_id=None, classification_id=None, permissions_check_current_user_has_some_case_access(case_id, [CaseAccessLevel.full_access]) case = cases_get_by_identifier(case_id) + previous_state_id = case.state_id # If user tries to update the customer, check if the user has access to the new customer if request.get('case_customer') and request.get('case_customer') != case.client_id: @@ -197,5 +198,5 @@ def mutate(root, info, case_id, name=None, soc_id=None, classification_id=None, updated_case = add_case_schema.load(request, instance=case, partial=True) protagonists = request.get('protagonists') tags = request.get('case_tags') - case = cases_update(case, updated_case, protagonists, tags) + case = cases_update(case, updated_case, protagonists, tags, previous_state_id=previous_state_id) return CaseUpdate(case=case) From 15e8d0ca223519574f73a861f5f92351ee9ecca6 Mon Sep 17 00:00:00 2001 From: jason Date: Sun, 8 Mar 2026 08:46:40 -0700 Subject: [PATCH 08/10] [#1049][#1050][TEST] Add state-transition regression coverage for close/reopen - Add helper lookups for case state IDs by name and non-Closed selection. - Add API v2 test asserting transition to Closed sets close_date. - Add manage update test asserting transition to Closed sets close_date. - Add API v2 test asserting transition out of Closed clears close_date and keeps selected state. - Add manage update test asserting transition out of Closed clears close_date and keeps selected state. --- tests/tests_rest_cases.py | 66 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/tests/tests_rest_cases.py b/tests/tests_rest_cases.py index 77095493d..c41d248a9 100644 --- a/tests/tests_rest_cases.py +++ b/tests/tests_rest_cases.py @@ -27,6 +27,32 @@ def _get_case_with_identifier(response, identifier): raise ValueError('Case not found') +def _get_case_state_identifier_by_name(subject, state_name): + response = subject.get('/manage/case-states/list').json() + for case_state in response['data']: + if case_state['state_name'].lower() == state_name.lower(): + return case_state['state_id'] + + raise ValueError(f'Case state {state_name} not found') + + +def _get_non_closed_case_state_identifier(subject): + response = subject.get('/manage/case-states/list').json() + open_state_identifier = None + + for case_state in response['data']: + state_name = case_state['state_name'].lower() + if state_name == 'open': + open_state_identifier = case_state['state_id'] + if state_name not in ('closed', 'open'): + return case_state['state_id'] + + if open_state_identifier is not None: + return open_state_identifier + + raise ValueError('No non-closed case state found') + + class TestsRestCases(TestCase): def setUp(self) -> None: @@ -252,3 +278,43 @@ def test_close_case_should_set_closing_date(self): identifier = self._subject.create_dummy_case() response = self._subject.create(f'/manage/cases/close/{identifier}', {}).json() self.assertIsNotNone(response['data']['close_date']) + + def test_update_case_state_to_closed_should_set_closing_date(self): + identifier = self._subject.create_dummy_case() + closed_state_identifier = _get_case_state_identifier_by_name(self._subject, 'Closed') + response = self._subject.update(f'/api/v2/cases/{identifier}', {'state_id': closed_state_identifier}).json() + + self.assertEqual(closed_state_identifier, response['state']['state_id']) + self.assertIsNotNone(response['close_date']) + + def test_manage_update_case_state_to_closed_should_set_closing_date(self): + identifier = self._subject.create_dummy_case() + closed_state_identifier = _get_case_state_identifier_by_name(self._subject, 'Closed') + response = self._subject.create( + f'/manage/cases/update/{identifier}', + {'state_id': closed_state_identifier} + ).json() + + self.assertEqual(closed_state_identifier, response['data']['state_id']) + self.assertIsNotNone(response['data']['close_date']) + + def test_update_case_state_to_non_closed_should_clear_closing_date(self): + identifier = self._subject.create_dummy_case() + reopened_state_identifier = _get_non_closed_case_state_identifier(self._subject) + self._subject.create(f'/manage/cases/close/{identifier}', {}) + response = self._subject.update(f'/api/v2/cases/{identifier}', {'state_id': reopened_state_identifier}).json() + + self.assertEqual(reopened_state_identifier, response['state']['state_id']) + self.assertIsNone(response['close_date']) + + def test_manage_update_case_state_to_non_closed_should_clear_closing_date(self): + identifier = self._subject.create_dummy_case() + reopened_state_identifier = _get_non_closed_case_state_identifier(self._subject) + self._subject.create(f'/manage/cases/close/{identifier}', {}) + response = self._subject.create( + f'/manage/cases/update/{identifier}', + {'state_id': reopened_state_identifier} + ).json() + + self.assertEqual(reopened_state_identifier, response['data']['state_id']) + self.assertIsNone(response['data']['close_date']) From 2c4d58f2eb344a86eed4ce41c26b85b52fe68fbe Mon Sep 17 00:00:00 2001 From: jason Date: Sun, 8 Mar 2026 08:46:45 -0700 Subject: [PATCH 09/10] [#1049][#1050][IMP] Confirm close/reopen transitions when saving state edits - Persist an initial state marker when entering edit mode for transition comparison. - Detect the Closed state option dynamically from the state select list. - Prompt for confirmation when a save would close or reopen the case via state change. - Route confirmed transitions through submit_case_edit() so existing payload save logic remains unchanged. --- ui/src/pages/manage.cases.common.js | 51 +++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/ui/src/pages/manage.cases.common.js b/ui/src/pages/manage.cases.common.js index 17c35cac8..399631a69 100644 --- a/ui/src/pages/manage.cases.common.js +++ b/ui/src/pages/manage.cases.common.js @@ -107,6 +107,9 @@ function remove_case(id) { function edit_case_info() { $('#case_gen_info_content').hide(); $('#case_gen_info_edit').show(); + if ($('#case_state').attr('data-initial-state-id') === undefined) { + $('#case_state').attr('data-initial-state-id', $('#case_state').val()); + } $('.case-info-readonly-action').hide(); $('#cancel_case_info').show(); $('#save_case_info').show(); @@ -122,8 +125,56 @@ function cancel_case_edit() { $('#case_info').show(); } +function get_closed_case_state_identifier() { + var closed_state_option = $('#case_state option').filter(function () { + return $(this).text().trim().toLowerCase() === 'closed'; + }).first(); + + if (closed_state_option.length === 0) { + return NaN; + } + + return parseInt(closed_state_option.val(), 10); +} + function save_case_edit(case_id) { + var previous_state_identifier = parseInt($('#case_state').attr('data-initial-state-id'), 10); + var selected_state_identifier = parseInt($('#case_state').val(), 10); + var closed_state_identifier = get_closed_case_state_identifier(); + + if (!Number.isNaN(previous_state_identifier) && + !Number.isNaN(selected_state_identifier) && + !Number.isNaN(closed_state_identifier)) { + var is_closing_case = previous_state_identifier !== closed_state_identifier && + selected_state_identifier === closed_state_identifier; + var is_reopening_case = previous_state_identifier === closed_state_identifier && + selected_state_identifier !== closed_state_identifier; + + if (is_closing_case || is_reopening_case) { + var case_action = is_closing_case ? 'close' : 'reopen'; + swal({ + title: "Are you sure?", + text: `Saving this change will ${case_action} the case`, + icon: "warning", + buttons: true, + dangerMode: true, + confirmButtonColor: '#3085d6', + cancelButtonColor: '#d33' + }) + .then((willApplyStateTransition) => { + if (willApplyStateTransition) { + submit_case_edit(case_id); + } + }); + + return; + } + } + + submit_case_edit(case_id); +} +function submit_case_edit(case_id) { var data_sent = $('form#form_update_case').serializeObject(); var map_protagonists = Object(); From c9839711a21a711439a79987a85d707bf4eafb64 Mon Sep 17 00:00:00 2001 From: jason Date: Sun, 8 Mar 2026 09:05:08 -0700 Subject: [PATCH 10/10] [#1049][#1050][IMP] Reuse existing close confirmation flow in state-save path - Extract close confirmation into confirm_close_case() so save and footer button use the same swal behavior. - Update close_case() to call confirm_close_case() and keep existing close endpoint behavior unchanged. - Remove custom save-specific swal and route state-to-Closed transitions through the shared close confirmation flow. - Keep reopen-on-save path free of extra prompts, matching existing reopen button behavior. --- ui/src/pages/manage.cases.common.js | 46 ++++++++++++++--------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/ui/src/pages/manage.cases.common.js b/ui/src/pages/manage.cases.common.js index 399631a69..7a8b76ce4 100644 --- a/ui/src/pages/manage.cases.common.js +++ b/ui/src/pages/manage.cases.common.js @@ -24,7 +24,7 @@ function case_detail(id) { } /* Close case function */ -function close_case(id) { +function confirm_close_case(id, on_confirm) { swal({ title: "Are you sure?", text: "Case ID " + id + " will be closed and will not appear in contexts anymore", @@ -36,18 +36,24 @@ function close_case(id) { confirmButtonText: 'Yes, close it!' }) .then((willClose) => { - if (willClose) { - post_request_api(`/manage/cases/close/${id}`) - .done((data) => { - if (!refresh_case_table()) { - window.location.reload(); - } - $('#modal_case_detail').modal('hide'); - }); + if (willClose && on_confirm) { + on_confirm(); } }); } +function close_case(id) { + confirm_close_case(id, function () { + post_request_api(`/manage/cases/close/${id}`) + .done((data) => { + if (!refresh_case_table()) { + window.location.reload(); + } + $('#modal_case_detail').modal('hide'); + }); + }); +} + /* Reopen case function */ function reopen_case(id) { post_request_api(`/manage/cases/reopen/${id}`) @@ -150,23 +156,15 @@ function save_case_edit(case_id) { var is_reopening_case = previous_state_identifier === closed_state_identifier && selected_state_identifier !== closed_state_identifier; - if (is_closing_case || is_reopening_case) { - var case_action = is_closing_case ? 'close' : 'reopen'; - swal({ - title: "Are you sure?", - text: `Saving this change will ${case_action} the case`, - icon: "warning", - buttons: true, - dangerMode: true, - confirmButtonColor: '#3085d6', - cancelButtonColor: '#d33' - }) - .then((willApplyStateTransition) => { - if (willApplyStateTransition) { - submit_case_edit(case_id); - } + if (is_closing_case) { + confirm_close_case(case_id, function () { + submit_case_edit(case_id); }); + return; + } + if (is_reopening_case) { + submit_case_edit(case_id); return; } }