From d7d239d406ae1c19bcddf01532fcfbe90964b5ce Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Mon, 3 Jun 2019 11:49:16 -0400 Subject: [PATCH] Alphabetize flash messages --- atst/utils/flash.py | 184 ++++++++++++++++++++++---------------------- 1 file changed, 92 insertions(+), 92 deletions(-) diff --git a/atst/utils/flash.py b/atst/utils/flash.py index b16dee89..47efa58b 100644 --- a/atst/utils/flash.py +++ b/atst/utils/flash.py @@ -2,19 +2,32 @@ from flask import flash, render_template_string from atst.utils.localization import translate MESSAGES = { + "application_environment_members_updated": { + "title_template": "Application environment members updated", + "message_template": "Application environment members have been updated", + "category": "success", + }, + "application_deleted": { + "title_template": translate("flash.success"), + "message_template": """ + {{ "flash.application.deleted" | translate({"application_name": application_name}) }} + {{ "common.undo" | translate }} + """, + "category": "success", + }, + "application_environments_updated": { + "title_template": "Application environments updated", + "message_template": "Application environments have been updated", + "category": "success", + }, "application_member_removed": { "title_template": "Team member removed from application", "message_template": "You have successfully deleted {{ user_name }} from {{ application_name }}", "category": "success", }, - "environment_deleted": { - "title_template": "{{ environment_name }} deleted", - "message_template": 'The environment "{{ environment_name }}" has been deleted', - "category": "success", - }, - "application_environment_members_updated": { - "title_template": "Application environment members updated", - "message_template": "Application environment members have been updated", + "environment_access_changed": { + "title_template": "User access successfully changed.", + "message_template": "", "category": "success", }, "environment_added": { @@ -24,37 +37,44 @@ MESSAGES = { """, "category": "success", }, - "application_environments_updated": { - "title_template": "Application environments updated", - "message_template": "Application environments have been updated", + "environment_deleted": { + "title_template": "{{ environment_name }} deleted", + "message_template": 'The environment "{{ environment_name }}" has been deleted', "category": "success", }, - "primary_point_of_contact_changed": { - "title_template": translate("flash.new_ppoc_title"), - "message_template": """{{ "flash.new_ppoc_message" | translate({ "ppoc_name": ppoc_name }) }}""", - "category": "success", + "form_errors": { + "title_template": "There were some errors", + "message_template": "

Please see below.

", + "category": "error", }, "invitation_resent": { "title_template": "Invitation resent", "message_template": "The {{ officer_type }} has been resent instructions to join this portfolio.", "category": "success", }, - "task_order_draft": { - "title_template": translate("task_orders.form.draft_alert_title"), - "message_template": translate("task_orders.form.draft_alert_message"), + "logged_out": { + "title_template": translate("flash.logged_out"), + "message_template": """ + You've been logged out. + """, + "category": "info", + }, + "login_next": { + "title_template": translate("flash.login_required_title"), + "message_template": translate("flash.login_required_message"), "category": "warning", }, - "task_order_signed": { - "title_template": "Task Order Signed", + "new_application_member": { + "title_template": translate("flash.success"), "message_template": """ -

Task order has been signed successfully

+

{{ "flash.new_application_member" | translate({ "user_name": new_member.user_name }) }}

""", "category": "success", }, - "update_portfolio_members": { - "title_template": "Success!", + "new_portfolio": { + "title_template": "Portfolio created!", "message_template": """ -

You have successfully updated access permissions for members of {{ portfolio.name }}.

+

You are now ready to create applications and environments within the JEDI Cloud.

""", "category": "success", }, @@ -65,17 +85,17 @@ MESSAGES = { """, "category": "success", }, - "revoked_portfolio_access": { - "title_template": "Removed portfolio access", + "portfolio_member_dod_id_error": { + "title_template": "CAC ID Error", "message_template": """ -

Portfolio access successfully removed from {{ member_name }}.

+ The member attempted to accept this invite, but their CAC ID did not match the CAC ID you specified on the invite. Please confirm that the DoD ID is accurate. """, - "category": "success", + "category": "error", }, - "resend_portfolio_invitation": { - "title_template": "Invitation resent", + "portfolio_member_removed": { + "title_template": translate("flash.deleted_member"), "message_template": """ -

Successfully sent a new invitation to {{ user_name }}.

+ {{ "flash.delete_member_success" | translate({ "member_name": member_name }) }} """, "category": "success", }, @@ -86,6 +106,25 @@ MESSAGES = { """, "category": "success", }, + "primary_point_of_contact_changed": { + "title_template": translate("flash.new_ppoc_title"), + "message_template": """{{ "flash.new_ppoc_message" | translate({ "ppoc_name": ppoc_name }) }}""", + "category": "success", + }, + "resend_portfolio_invitation": { + "title_template": "Invitation resent", + "message_template": """ +

Successfully sent a new invitation to {{ user_name }}.

+ """, + "category": "success", + }, + "revoked_portfolio_access": { + "title_template": "Removed portfolio access", + "message_template": """ +

Portfolio access successfully removed from {{ member_name }}.

+ """, + "category": "success", + }, "session_expired": { "title_template": "Session Expired", "message_template": """ @@ -93,52 +132,6 @@ MESSAGES = { """, "category": "error", }, - "login_next": { - "title_template": translate("flash.login_required_title"), - "message_template": translate("flash.login_required_message"), - "category": "warning", - }, - "new_portfolio": { - "title_template": "Portfolio created!", - "message_template": """ -

You are now ready to create applications and environments within the JEDI Cloud.

- """, - "category": "success", - }, - "portfolio_member_dod_id_error": { - "title_template": "CAC ID Error", - "message_template": """ - The member attempted to accept this invite, but their CAC ID did not match the CAC ID you specified on the invite. Please confirm that the DoD ID is accurate. - """, - "category": "error", - }, - "form_errors": { - "title_template": "There were some errors", - "message_template": "

Please see below.

", - "category": "error", - }, - "user_must_complete_profile": { - "title_template": "You must complete your profile", - "message_template": "

Before continuing, you must complete your profile

", - "category": "info", - }, - "user_updated": { - "title_template": "User information updated.", - "message_template": "", - "category": "success", - }, - "environment_access_changed": { - "title_template": "User access successfully changed.", - "message_template": "", - "category": "success", - }, - "task_order_submitted": { - "title_template": "Task Order Form Submitted", - "message_template": """ - Your task order form for {{ task_order.portfolio_name }} has been submitted. - """, - "category": "success", - }, "task_order_congrats": { "title_template": translate("flash.congrats"), "message_template": translate("flash.new_portfolio"), @@ -157,6 +150,11 @@ MESSAGES = { """, "category": "success", }, + "task_order_draft": { + "title_template": translate("task_orders.form.draft_alert_title"), + "message_template": translate("task_orders.form.draft_alert_message"), + "category": "warning", + }, "task_order_incomplete": { "title_template": "Task Order Incomplete", "message_template": """ @@ -164,25 +162,24 @@ MESSAGES = { """, "category": "error", }, - "portfolio_member_removed": { - "title_template": translate("flash.deleted_member"), + "task_order_signed": { + "title_template": "Task Order Signed", "message_template": """ - {{ "flash.delete_member_success" | translate({ "member_name": member_name }) }} +

Task order has been signed successfully

""", "category": "success", }, - "application_deleted": { - "title_template": translate("flash.success"), + "task_order_submitted": { + "title_template": "Task Order Form Submitted", "message_template": """ - {{ "flash.application.deleted" | translate({"application_name": application_name}) }} - {{ "common.undo" | translate }} + Your task order form for {{ task_order.portfolio_name }} has been submitted. """, "category": "success", }, - "new_application_member": { - "title_template": translate("flash.success"), + "update_portfolio_members": { + "title_template": "Success!", "message_template": """ -

{{ "flash.new_application_member" | translate({ "user_name": new_member.user_name }) }}

+

You have successfully updated access permissions for members of {{ portfolio.name }}.

""", "category": "success", }, @@ -193,13 +190,16 @@ MESSAGES = { """, "category": "success", }, - "logged_out": { - "title_template": translate("flash.logged_out"), - "message_template": """ - You've been logged out. - """, + "user_must_complete_profile": { + "title_template": "You must complete your profile", + "message_template": "

Before continuing, you must complete your profile

", "category": "info", }, + "user_updated": { + "title_template": "User information updated.", + "message_template": "", + "category": "success", + }, }