From e63e5082f6988b56bd7735a0dc328d306efa3ee4 Mon Sep 17 00:00:00 2001
From: Westly Wright <westly.wright@gmail.com>
Date: Tue, 3 Mar 2020 12:25:53 -0700
Subject: [PATCH] MC App Rollback hide additional fields & add help text to
 modals

rancher/rancher#25512
---
 app/components/modal-rollback-app/template.hbs  | 17 +++++++++++------
 .../modal-rollback-mc-app/component.js          |  2 +-
 .../modal-rollback-mc-app/template.hbs          | 17 +++++++++++------
 translations/en-us.yaml                         |  1 +
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/app/components/modal-rollback-app/template.hbs b/app/components/modal-rollback-app/template.hbs
index 4f0ce4050..9b20b7284 100644
--- a/app/components/modal-rollback-app/template.hbs
+++ b/app/components/modal-rollback-app/template.hbs
@@ -1,9 +1,14 @@
-<h2>
-  {{t
-    "modalRollbackApp.title"
-    appName=model.displayName
-  }}
-</h2>
+<header class="header">
+  <h2>
+    {{t
+      "modalRollbackApp.title"
+      appName=model.displayName
+    }}
+  </h2>
+  <div class="pro-tip">
+    {{t "modalRollbackApp.protip"}}
+  </div>
+</header>
 
 {{#if loading}}
   <i class="icon icon-spinner icon-spin"/> {{t "generic.loading"}}
diff --git a/app/components/modal-rollback-mc-app/component.js b/app/components/modal-rollback-mc-app/component.js
index 5d1c8224d..06fd741c1 100644
--- a/app/components/modal-rollback-mc-app/component.js
+++ b/app/components/modal-rollback-mc-app/component.js
@@ -6,7 +6,7 @@ import jsondiffpatch from 'jsondiffpatch';
 import moment from 'moment';
 import { notEmpty } from '@ember/object/computed';
 
-const HIDDEN_FIELDS = ['digest'];
+const HIDDEN_FIELDS = ['digest', 'created', 'createdTS', 'links', 'uuid', 'id', 'name'];
 
 function sanitizeToRemoveHiddenKeys(config) {
   HIDDEN_FIELDS.forEach((key) => {
diff --git a/app/components/modal-rollback-mc-app/template.hbs b/app/components/modal-rollback-mc-app/template.hbs
index 4dd31f139..a3635d95c 100644
--- a/app/components/modal-rollback-mc-app/template.hbs
+++ b/app/components/modal-rollback-mc-app/template.hbs
@@ -1,9 +1,14 @@
-<h2>
-  {{t
-    "modalRollbackApp.title"
-    appName=model.displayName
-  }}
-</h2>
+<header class="header">
+  <h2>
+    {{t
+      "modalRollbackApp.title"
+      appName=model.displayName
+    }}
+  </h2>
+  <div class="pro-tip">
+    {{t "modalRollbackApp.protip"}}
+  </div>
+</header>
 
 {{#if loading}}
   <i class="icon icon-spinner icon-spin"/> {{t "generic.loading"}}
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index 427ba1fa0..6ba9b3b63 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -7774,6 +7774,7 @@ modalRollbackService:
 
 modalRollbackApp:
   title: 'Rollback "{appName}"'
+  protip: 'The "Rollback" action will create a new revision with the same configuration as the selected revision.'
   action: Rollback
   current:
     label: Current Revision