From ea3d040b536c8de16c6c2c53ed8207c8469eb8f8 Mon Sep 17 00:00:00 2001
From: Lisbet Alvarez <107949262+lisbet-alvarez@users.noreply.github.com>
Date: Thu, 11 Jul 2024 10:46:29 -0700
Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20update=20messages=20?=
 =?UTF-8?q?&=20update=20button=20to=20match=20new=20change=20(#2382)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor: 💡 update messages & update button to match new change
---
 addons/core/translations/resources/en-us.yaml               | 6 +++++-
 .../app/components/form/role/manage-org-projects/index.hbs  | 2 +-
 .../scopes/scope/roles/role/manage-scopes/index.js          | 2 +-
 .../scope/roles/role/manage-scopes/manage-custom-scopes.js  | 2 +-
 .../scope/roles/role/manage-scopes/manage-org-projects.js   | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index a187a55c4..c23c7df39 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -584,15 +584,18 @@ role:
       manage-scopes:
         title: Manage Scopes
         description: Select which scopes you want to add to this role.
+        success: Scope selection saved
       keywords-selected:
         description: Just a heads up, you can't select both add all descendants and add all children. You can only choose one or the other.
         link: You can read more about it here
       manage-custom-scopes:
         title: Manage Custom Scopes
         description: Select which specific orgs you want to apply to this role's grant sets.
+        success: Custom scope selection saved
       manage-org-projects:
-        title: 'Add Projects in {orgDisplayName}'
+        title: Add Projects in {orgDisplayName}
         description: Select which projects in this org you want to apply to this role's grant sets.
+        success: Projects in org have been updated
       no-org-scopes:
         title: No Org Scopes Available
         description: Org scopes are not available for assignment.
@@ -611,6 +614,7 @@ role:
         text: Manage custom scopes
         help: Customize which scopes are associated with this role.
       view-projects: '{selected}/{total} total projects'
+      apply: Apply changes to org
     form:
       this:
         label: Add this scope
diff --git a/ui/admin/app/components/form/role/manage-org-projects/index.hbs b/ui/admin/app/components/form/role/manage-org-projects/index.hbs
index 1a2597401..2cb683ce8 100644
--- a/ui/admin/app/components/form/role/manage-org-projects/index.hbs
+++ b/ui/admin/app/components/form/role/manage-org-projects/index.hbs
@@ -71,7 +71,7 @@
       />
 
       <form.actions
-        @submitText={{t 'actions.save'}}
+        @submitText={{t 'resources.role.scope.actions.apply'}}
         @cancelText={{t 'actions.cancel'}}
       />
     {{else}}
diff --git a/ui/admin/app/controllers/scopes/scope/roles/role/manage-scopes/index.js b/ui/admin/app/controllers/scopes/scope/roles/role/manage-scopes/index.js
index 8ae00de16..ef7f9f2b4 100644
--- a/ui/admin/app/controllers/scopes/scope/roles/role/manage-scopes/index.js
+++ b/ui/admin/app/controllers/scopes/scope/roles/role/manage-scopes/index.js
@@ -28,7 +28,7 @@ export default class ScopesScopeRolesRoleManageScopesIndexController extends Con
   @action
   @loading
   @notifyError(({ message }) => message, { catch: true })
-  @notifySuccess('notifications.add-success')
+  @notifySuccess('resources.role.scope.messages.manage-scopes.success')
   async setGrantScopes(role, grantScopeIDs) {
     await role.setGrantScopes(grantScopeIDs);
     this.router.replaceWith('scopes.scope.roles.role.scopes');
diff --git a/ui/admin/app/controllers/scopes/scope/roles/role/manage-scopes/manage-custom-scopes.js b/ui/admin/app/controllers/scopes/scope/roles/role/manage-scopes/manage-custom-scopes.js
index 93a905c1a..66940700a 100644
--- a/ui/admin/app/controllers/scopes/scope/roles/role/manage-scopes/manage-custom-scopes.js
+++ b/ui/admin/app/controllers/scopes/scope/roles/role/manage-scopes/manage-custom-scopes.js
@@ -48,7 +48,7 @@ export default class ScopesScopeRolesRoleManageScopesManageCustomScopesControlle
   @action
   @loading
   @notifyError(({ message }) => message, { catch: true })
-  @notifySuccess('notifications.add-success')
+  @notifySuccess('resources.role.scope.messages.manage-custom-scopes.success')
   async setGrantScopes(role, grantScopeIDs) {
     await role.setGrantScopes(grantScopeIDs);
     this.manageScopes.showCheckIcon = true;
diff --git a/ui/admin/app/controllers/scopes/scope/roles/role/manage-scopes/manage-org-projects.js b/ui/admin/app/controllers/scopes/scope/roles/role/manage-scopes/manage-org-projects.js
index 997c7fb72..18c179154 100644
--- a/ui/admin/app/controllers/scopes/scope/roles/role/manage-scopes/manage-org-projects.js
+++ b/ui/admin/app/controllers/scopes/scope/roles/role/manage-scopes/manage-org-projects.js
@@ -48,7 +48,7 @@ export default class ScopesScopeRolesRoleManageScopesManageOrgProjectsController
   @action
   @loading
   @notifyError(({ message }) => message, { catch: true })
-  @notifySuccess('notifications.add-success')
+  @notifySuccess('resources.role.scope.messages.manage-org-projects.success')
   async setGrantScopes(role, grantScopeIDs) {
     await role.setGrantScopes(grantScopeIDs);
     this.manageScopes.showCheckIcon = true;