From ae1f600147b54b49967746d3e60782fb0fdc0d25 Mon Sep 17 00:00:00 2001 From: Jon Date: Sat, 26 Apr 2025 07:28:04 +0930 Subject: [PATCH] feat(core): Add routes for Ticket Comments ref: #732 #726 --- Release-Notes.md | 2 ++ app/api/react_ui_metadata.py | 11 +++++++++++ app/api/urls_v2.py | 10 +++++----- app/app/settings.py | 9 +++++++++ 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/Release-Notes.md b/Release-Notes.md index 454544c2..fd50bdae 100644 --- a/Release-Notes.md +++ b/Release-Notes.md @@ -2,6 +2,8 @@ - Employees model added behind feature flag `2025-00002` and will remain behind this flag until production ready. +- Ticket and Ticket Comment added behind feature flag `2025-00006` and will remain behind this flag until production ready. + ## Version 1.15.0 diff --git a/app/api/react_ui_metadata.py b/app/api/react_ui_metadata.py index ebf9d300..ddbe25e5 100644 --- a/app/api/react_ui_metadata.py +++ b/app/api/react_ui_metadata.py @@ -608,6 +608,17 @@ class ReactUIMetadata(OverRideJSONAPIMetadata): } }) + if request.feature_flag['2025-00006']: + + nav['assistance']['pages'].update({ + 'itim.view_requestticket': { + "display_name": "Requests New", + "name": "request_new", + "icon": "ticket_request", + "link": "/core/ticket/request" + } + }) + return nav diff --git a/app/api/urls_v2.py b/app/api/urls_v2.py index 0c3b9eee..8c004528 100644 --- a/app/api/urls_v2.py +++ b/app/api/urls_v2.py @@ -200,12 +200,12 @@ router.register('(?P[a-z_]+)/(?P.+)/(?P[0-9]+)/ ticket_type_names = str(ticket_type_names)[:-1] -router.register(f'core/ticket/(?P[{ticket_type_names}]+)', ticket.ViewSet, feature_flag = '2025-00002', basename='_api_v2_ticket_sub') +router.register(f'core/ticket/(?P[{ticket_type_names}]+)', ticket.ViewSet, feature_flag = '2025-00006', basename='_api_v2_ticket_sub') router.register('core/ticket', ticket.NoDocsViewSet, basename='_api_v2_ticket') -router.register('core/ticket/(?P[0-9]+)/comment', ticket_comment.NoDocsViewSet, basename='_api_v2_ticket_comment_base') -router.register('core/ticket/(?P[0-9]+)/comment/(?P[0-9]+)/threads', ticket_comment.ViewSet, basename='_api_v2_ticket_comment_base_thread') +router.register('core/ticket/(?P[0-9]+)/comment', ticket_comment.NoDocsViewSet, feature_flag = '2025-00006', basename='_api_v2_ticket_comment_base') +router.register('core/ticket/(?P[0-9]+)/comment/(?P[0-9]+)/threads', ticket_comment.ViewSet, feature_flag = '2025-00006', basename='_api_v2_ticket_comment_base_thread') @@ -217,8 +217,8 @@ router.register('core/ticket/(?P[0-9]+)/related_ticket', related_tick ticket_comment_names = str(ticket_comment_names)[:-1] -router.register(f'core/ticket/(?P[0-9]+)/(?P[{ticket_comment_names}]+)', ticket_comment.ViewSet, basename='_api_v2_ticket_comment_base_sub') -router.register(f'core/ticket/(?P[0-9]+)/(?P[{ticket_comment_names}]+)/(?P[0-9]+)/threads', ticket_comment.ViewSet, basename='_api_v2_ticket_comment_base_sub_thread') +router.register(f'core/ticket/(?P[0-9]+)/(?P[{ticket_comment_names}]+)', ticket_comment.ViewSet, feature_flag = '2025-00006', basename='_api_v2_ticket_comment_base_sub') +router.register(f'core/ticket/(?P[0-9]+)/(?P[{ticket_comment_names}]+)/(?P[0-9]+)/threads', ticket_comment.ViewSet, feature_flag = '2025-00006', basename='_api_v2_ticket_comment_base_sub_thread') router.register('core/(?P[a-z_]+)/(?P[0-9]+)/item_ticket', ticket_linked_item.ViewSet, basename='_api_v2_item_tickets') diff --git a/app/app/settings.py b/app/app/settings.py index ec3759e3..792bcf00 100644 --- a/app/app/settings.py +++ b/app/app/settings.py @@ -557,6 +557,15 @@ if FEATURE_FLAGGING_ENABLED: "modified": "" } }, + { + "2025-00006": { + "name": "Ticket Models", + "description": "Ticket Model re-write. see https://github.com/nofusscomputing/centurion_erp/issues/564", + "enabled": True, + "created": "", + "modified": "" + } + } ] feature_flag.update({