Notification improvements (codeready-toolchain#1138)

* proposed text updates

* removing link

* fix tests for sandbox notification changes

* capital H, add comma, remove be

* Update deploy/templates/notificationtemplates/sandbox/idlertriggered/notification.html

Co-authored-by: Kathryn Yetter <46502874+kyetter@users.noreply.github.com>

* Update deploy/templates/notificationtemplates/sandbox/idlertriggered/notification.html

Co-authored-by: Kathryn Yetter <46502874+kyetter@users.noreply.github.com>

* add feedback line with email in idler and provisioned, fix identation in idler

* fix notification body test after idler changes

* Update deploy/templates/notificationtemplates/sandbox/userdeactivating/notification.html

Co-authored-by: Matous Jobanek <mjobanek@redhat.com>

* Update deploy/templates/notificationtemplates/sandbox/idlertriggered/notification.html

Co-authored-by: Rajiv Senthilnathan <rajivnathan@gmail.com>

* Update deploy/templates/notificationtemplates/sandbox/idlertriggered/notification.html

Co-authored-by: Rajiv Senthilnathan <rajivnathan@gmail.com>

* fix test to include new changes in idler template

---------

Co-authored-by: kyetter <kyetter@redhat.com>
Co-authored-by: Matous Jobanek <mjobanek@redhat.com>
Co-authored-by: Kathryn Yetter <46502874+kyetter@users.noreply.github.com>
Co-authored-by: Francisc Munteanu <fmuntean@redhat.com>
Co-authored-by: Rajiv Senthilnathan <rajivnathan@gmail.com>
Co-authored-by: Alexey Kazakov <alkazako@redhat.com>

Author: 6 people

deploy/templates/notificationtemplates/sandbox/idlertriggered/notification.html

@@ -41,22 +41,21 @@
 >
 
     <p>
-        You are receiving this email because one or more of your workloads in the Developer Sandbox for
-        Red Hat OpenShift has been running for 12 hours.
+        You are receiving this email because one or more of your workloads in the Developer Sandbox has been running for 12 hours and has been automatically idled.
     </p>
 
     <p>
-        In accordance with the usage terms of Developer Sandbox, your workload {{.AppType}} {{.AppName}} has been scaled down. You can restart your workload(s) or scale up the number of instances from the
-        Developer Sandbox User Interface.
+        After 12 hours, our system idles running workloads. No further action is required by you. You can <a href="https://developers.redhat.com/learn/openshift/revive-inactive-openshift-pods-scaled-zero">restart your workload,</a> {{.AppType}} {{.AppName}}
+        when you're ready to continue exploring on the Developer Sandbox.
     </p>
 
     <p>
-        Please reach us at {{.ReplyTo}} with any questions.
+        To share feedback or ask questions, reach out to us at {{.ReplyTo}}.
     </p>
 
     <p>
         Thanks,<br />
-        The Developer Sandbox for Red Hat OpenShift team
+        The Developer Sandbox team
     </p>
 </div>
 </body>

deploy/templates/notificationtemplates/sandbox/userdeactivated/notification.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>
-        Notice: Your Developer Sandbox for Red Hat OpenShift account is deactivated.
+        Notice: Your Developer Sandbox account is deactivated.
     </title>
     <style>
         a:hover {
@@ -41,23 +41,21 @@
 >
 
     <p>
-        You are receiving this email because you have a Developer Sandbox for Red Hat OpenShift
-        account associated with {{.UserEmail}}.
+        You are receiving this email because the Developer Sandbox account associated with {{.UserEmail}} is now deactivated.
+        All your data on Developer Sandbox has been deleted. You can start a new trial at {{.RegistrationURL}}, whenever you would like.
     </p>
 
     <p>
-        Your account is now deactivated and all your data on Developer Sandbox for Red Hat OpenShift has been deleted.
-        You can request new access by signing up again at {{.RegistrationURL}}
+        To learn more about how Red Hat products, support and training could benefit your organization, <a href="https://www.redhat.com/en/contact">request a callback.</a>
     </p>
 
     <p>
-        Join the Dev Sandbox community to share your feedback, request extension for your Sandbox environment from the #dev-sandbox channel on DevNation slack workspace.
-        You can join using this <a href="https://join.slack.com/t/rhdevnation/shared_invite/zt-27vfuywt3-TC7QuckHfxHatLj6Abk2_A">invite</a>. You can also reach us via email at {{.ReplyTo}} with any questions.
+        To share feedback about your experience with the Developer Sandbox, email us at {{.ReplyTo}}.
     </p>
 
     <p>
         Thanks,<br />
-        The Developer Sandbox for Red Hat OpenShift team
+        The Developer Sandbox team
     </p>
 </div>
 </body>

deploy/templates/notificationtemplates/sandbox/userdeactivated/subject.txt

@@ -1 +1 @@
-Notice: Your Developer Sandbox for Red Hat OpenShift account is deactivated
+Notice: Your Developer Sandbox account is deactivated

deploy/templates/notificationtemplates/sandbox/userdeactivating/notification.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>
-        Notice: Your Developer Sandbox for Red Hat OpenShift account will be deactivated soon.
+        Notice: Your Developer Sandbox account will be deactivated soon.
     </title>
     <style>
         a:hover {
@@ -41,23 +41,21 @@
 >
 
     <p>
-        You are receiving this email because your email account {{.UserEmail}} was provisioned to Developer Sandbox for
-        Red Hat OpenShift.
+        The Developer Sandbox account associated with {{.UserEmail}} will expire in 3 days.
     </p>
 
     <p>
-        Your sandbox will expire in 3 days.  We recommend you save your work as all data in your sandbox will be
-        deleted upon expiry.  After deactivation, you can sign up again at any time for new access at {{.RegistrationURL}}.
+        We recommend you <a href="https://developers.redhat.com/learn/openshift/export-your-application-sandbox-red-hat-openshift-service-aws">export your work</a> 
+        as all data in your sandbox will be deleted.  After deactivation, you can sign up again at any time for new access at {{.RegistrationURL}}.
     </p>
 
     <p>
-        Join the Dev Sandbox community to share your feedback, request extension for your Sandbox environment from the #dev-sandbox channel on DevNation slack workspace.
-        You can join using this <a href="https://join.slack.com/t/rhdevnation/shared_invite/zt-27vfuywt3-TC7QuckHfxHatLj6Abk2_A">invite</a>. You can also reach us via email at {{.ReplyTo}} with any questions.
+        To share feedback about your experience with the Developer Sandbox, email us at {{.ReplyTo}}.
     </p>
 
     <p>
         Thanks,<br />
-        The Developer Sandbox for Red Hat OpenShift team
+        The Developer Sandbox team
     </p>
 </div>
 </body>

deploy/templates/notificationtemplates/sandbox/userdeactivating/subject.txt

@@ -1 +1 @@
-Notice: Your Developer Sandbox for Red Hat OpenShift account will be deactivated soon
+Notice: Your Developer Sandbox account will be deactivated soon

deploy/templates/notificationtemplates/sandbox/userprovisioned/notification.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>
-        Notice: Your Developer Sandbox for Red Hat OpenShift account is provisioned.
+        Notice: Your Developer Sandbox account is provisioned.
     </title>
     <style>
         a:hover {
@@ -41,27 +41,30 @@
 >
 
     <p>
-        You are receiving this email because you have a Developer Sandbox for Red Hat OpenShift
-        account associated with {{.UserEmail}}.
+        You are receiving this email because the Developer Sandbox account associated with {{.UserEmail}} 
+        is now provisioned and ready to use. Your account will be active for {{.DeactivationTimeoutDays}} days at no cost to you.
     </p>
 
     <p>
-        Your account has been provisioned and is ready to use. Your account will be active for {{.DeactivationTimeoutDays}} days.
-        At the end of the active period, your access will be deactivated and all your data on the Developer Sandbox will be deleted.
+        At the end of the active period, your access will be terminated and all your data on the Developer Sandbox will be deleted.
+        We will send you an email 3 days before deactivation with instructions to export your work, so you will not lose your progress.
     </p>
 
     <p>
         Please log in to {{.RegistrationURL}} to begin using your account.
     </p>
 
     <p>
-        Join the Dev Sandbox community and engage with the Red Hat team from the #dev-sandbox channel on DevNation slack workspace.
-        You can join using this <a href="https://join.slack.com/t/rhdevnation/shared_invite/zt-27vfuywt3-TC7QuckHfxHatLj6Abk2_A">invite</a>. You can also reach us via email at {{.ReplyTo}} with any questions.
+        Unsure of where to start? Check out our <a href="https://developers.redhat.com/developer-sandbox/activities">Developer Sandbox activities</a> for some ideas!
+    </p>
+
+    <p>
+        To share feedback or ask questions, reach out to us at {{.ReplyTo}}.
     </p>
 
     <p>
         Thanks,<br />
-        The Developer Sandbox for Red Hat OpenShift team
+        The Developer Sandbox team
     </p>
 </div>
 </body>

deploy/templates/notificationtemplates/sandbox/userprovisioned/subject.txt

@@ -1 +1 @@
-Notice: Your Developer Sandbox for Red Hat OpenShift account is provisioned
+Notice: Your Developer Sandbox account is provisioned

pkg/templates/notificationtemplates/notification_generator_test.go

@@ -19,8 +19,8 @@ func TestGetNotificationTemplate(t *testing.T) {
 			// then
 			require.NoError(t, err)
 			require.NotNil(t, template)
-			assert.Equal(t, "Notice: Your Developer Sandbox for Red Hat OpenShift account is deactivated", template.Subject)
-			assert.Contains(t, template.Content, "Your account is now deactivated and all your data on Developer Sandbox for Red Hat OpenShift has been deleted.")
+			assert.Equal(t, "Notice: Your Developer Sandbox account is deactivated", template.Subject)
+			assert.Contains(t, template.Content, "All your data on Developer Sandbox has been deleted. You can start a new trial")
 		})
 		t.Run("get userprovisioned notification template", func(t *testing.T) {
 			// when
@@ -29,8 +29,8 @@ func TestGetNotificationTemplate(t *testing.T) {
 			// then
 			require.NoError(t, err)
 			require.NotNil(t, template)
-			assert.Equal(t, "Notice: Your Developer Sandbox for Red Hat OpenShift account is provisioned", template.Subject)
-			assert.Contains(t, template.Content, "Your account has been provisioned and is ready to use. Your account will be active for")
+			assert.Equal(t, "Notice: Your Developer Sandbox account is provisioned", template.Subject)
+			assert.Contains(t, template.Content, "is now provisioned and ready to use. Your account will be active for")
 		})
 		t.Run("ensure cache is used", func(t *testing.T) {
 			// when
@@ -42,8 +42,8 @@ func TestGetNotificationTemplate(t *testing.T) {
 			require.NoError(t, err)
 			require.NotNil(t, template)
 			require.NotEmpty(t, template["userprovisioned"])
-			assert.Equal(t, "Notice: Your Developer Sandbox for Red Hat OpenShift account is provisioned", template["userprovisioned"].Subject)
-			assert.Contains(t, template["userprovisioned"].Content, "Your account has been provisioned and is ready to use. Your account will be active for")
+			assert.Equal(t, "Notice: Your Developer Sandbox account is provisioned", template["userprovisioned"].Subject)
+			assert.Contains(t, template["userprovisioned"].Content, "is now provisioned and ready to use. Your account will be active for")
 			assert.Equal(t, UserProvisionedTemplateName, template["userprovisioned"].Name)
 		})
 		t.Run("get userdeactivating notification template", func(t *testing.T) {
@@ -53,8 +53,8 @@ func TestGetNotificationTemplate(t *testing.T) {
 			// then
 			require.NoError(t, err)
 			require.NotNil(t, template)
-			assert.Equal(t, "Notice: Your Developer Sandbox for Red Hat OpenShift account will be deactivated soon", template.Subject)
-			assert.Contains(t, template.Content, "Your sandbox will expire in 3 days.  We recommend you save your work as all data in your sandbox will be\n        deleted upon expiry.")
+			assert.Equal(t, "Notice: Your Developer Sandbox account will be deactivated soon", template.Subject)
+			assert.Contains(t, template.Content, "The Developer Sandbox account associated with {{.UserEmail}} will expire in 3 days.")
 
 		})
 
@@ -66,7 +66,7 @@ func TestGetNotificationTemplate(t *testing.T) {
 			require.NoError(t, err)
 			require.NotNil(t, template)
 			assert.Equal(t, "Notice: Your running workload in namespace {{.Namespace}} has been idled", template.Subject)
-			assert.Contains(t, template.Content, "In accordance with the usage terms of Developer Sandbox, your workload {{.AppType}} {{.AppName}} has been scaled down.")
+			assert.Contains(t, template.Content, "You are receiving this email because one or more of your workloads in the Developer Sandbox has been running for 12 hours and has been automatically idled.")
 
 		})
 	})