From c5e6a8d35b74ee608434c5d0f206f110240da71a Mon Sep 17 00:00:00 2001
From: a-roberts <aroberts@uk.ibm.com>
Date: Mon, 27 Apr 2020 16:17:16 +0100
Subject: [PATCH] Improve ServiceAccount labels to inform users of default SA
 behaviour and need for RBAC

---
 src/containers/CreatePipelineRun/CreatePipelineRun.js | 5 +++++
 src/containers/CreateTaskRun/CreateTaskRun.js         | 5 +++++
 src/containers/ImportResources/ImportResources.js     | 2 +-
 src/containers/ImportResources/ImportResources.scss   | 9 +++++++++
 src/scss/CreateRun.scss                               | 9 +++++++++
 5 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/containers/CreatePipelineRun/CreatePipelineRun.js b/src/containers/CreatePipelineRun/CreatePipelineRun.js
index de7f04719..762d23987 100644
--- a/src/containers/CreatePipelineRun/CreatePipelineRun.js
+++ b/src/containers/CreatePipelineRun/CreatePipelineRun.js
@@ -617,6 +617,11 @@ class CreatePipelineRun extends React.Component {
                 id: 'dashboard.serviceAccountLabel.optional',
                 defaultMessage: 'ServiceAccount (optional)'
               })}
+              helperText={intl.formatMessage({
+                id: 'dashboard.createPipelineRun.serviceAccountHelperText',
+                defaultMessage:
+                  'Ensure the selected ServiceAccount (or the default if none selected) has permissions for creating PipelineRuns and for anything else your PipelineRun interacts with.'
+              })}
               namespace={namespace}
               selectedItem={
                 serviceAccount
diff --git a/src/containers/CreateTaskRun/CreateTaskRun.js b/src/containers/CreateTaskRun/CreateTaskRun.js
index 6c7a68669..ba0ec5943 100644
--- a/src/containers/CreateTaskRun/CreateTaskRun.js
+++ b/src/containers/CreateTaskRun/CreateTaskRun.js
@@ -699,6 +699,11 @@ class CreateTaskRun extends React.Component {
                 id: 'dashboard.serviceAccountLabel.optional',
                 defaultMessage: 'ServiceAccount (optional)'
               })}
+              helperText={intl.formatMessage({
+                id: 'dashboard.createTaskRun.serviceAccountHelperText',
+                defaultMessage:
+                  'Ensure the selected ServiceAccount (or the default if none selected) has permissions for creating TaskRuns and for anything else your TaskRun interacts with.'
+              })}
               namespace={namespace}
               selectedItem={
                 serviceAccount
diff --git a/src/containers/ImportResources/ImportResources.js b/src/containers/ImportResources/ImportResources.js
index c872d40cc..c2a537e7d 100644
--- a/src/containers/ImportResources/ImportResources.js
+++ b/src/containers/ImportResources/ImportResources.js
@@ -368,7 +368,7 @@ export class ImportResources extends Component {
                 helperText={intl.formatMessage({
                   id: 'dashboard.importResources.serviceAccount.helperText',
                   defaultMessage:
-                    'The ServiceAccount that the PipelineRun will run under (from the namespace above)'
+                    'The ServiceAccount that the PipelineRun applying resources will run under (from the namespace above). Ensure the selected ServiceAccount (or the default if none selected) has permissions for creating PipelineRuns and for anything else your PipelineRun interacts with, including any Tekton resources in the Git repository.'
                 })}
                 id="import-service-accounts-dropdown"
                 namespace={this.state.importerNamespace}
diff --git a/src/containers/ImportResources/ImportResources.scss b/src/containers/ImportResources/ImportResources.scss
index b09487683..c4a14b4fa 100644
--- a/src/containers/ImportResources/ImportResources.scss
+++ b/src/containers/ImportResources/ImportResources.scss
@@ -20,6 +20,15 @@ limitations under the License.
 }
 
 .tkn--importresources-outer {
+  
+  .bx--form__helper-text {
+    color: $text-05; // Since by default the contrast/colour choice is barely readable.
+  } 
+
+  .bx--label--disabled {
+    color: $text-05;
+  }
+  
   background-color: white;
   min-height: 30rem;
 
diff --git a/src/scss/CreateRun.scss b/src/scss/CreateRun.scss
index 0ec331c01..bd9cebf4e 100644
--- a/src/scss/CreateRun.scss
+++ b/src/scss/CreateRun.scss
@@ -18,6 +18,15 @@ limitations under the License.
     margin-bottom: 0;
   }
 
+  .bx--form__helper-text {
+    color: $text-05; // Since by default the contrast/colour choice is barely readable.
+    max-width: 100%;
+  } 
+  
+  .bx--label--disabled {
+    color: $text-05;
+  }
+
   .bx--text-input__field-wrapper {
     width: 100%;
   }