Merge branch 'stable-3.0'
* stable-3.0:
Add a copy button to copy the ssh key/gpg key
Update git submodules
Change-Id: Ife2077a113fdd3038e5a1bc0c39d710475a9456b
diff --git a/polygerrit-ui/app/elements/settings/gr-gpg-editor/gr-gpg-editor.html b/polygerrit-ui/app/elements/settings/gr-gpg-editor/gr-gpg-editor.html
index c5c1bfe..dbf5a03 100644
--- a/polygerrit-ui/app/elements/settings/gr-gpg-editor/gr-gpg-editor.html
+++ b/polygerrit-ui/app/elements/settings/gr-gpg-editor/gr-gpg-editor.html
@@ -19,6 +19,7 @@
<link rel="import" href="/bower_components/iron-autogrow-textarea/iron-autogrow-textarea.html">
<link rel="import" href="../../../styles/gr-form-styles.html">
<link rel="import" href="../../shared/gr-button/gr-button.html">
+<link rel="import" href="../../shared/gr-copy-clipboard/gr-copy-clipboard.html">
<link rel="import" href="../../shared/gr-overlay/gr-overlay.html">
<link rel="import" href="../../shared/gr-rest-api-interface/gr-rest-api-interface.html">
<link rel="import" href="../../../styles/shared-styles.html">
@@ -62,6 +63,7 @@
<th class="userIdHeader">User IDs</th>
<th class="keyHeader">Public Key</th>
<th></th>
+ <th></th>
</tr>
</thead>
<tbody>
@@ -81,6 +83,14 @@
link>Click to View</gr-button>
</td>
<td>
+ <gr-copy-clipboard
+ has-tooltip
+ button-title="Copy GPG public key to clipboard"
+ hide-input
+ text="[[key.key]]">
+ </gr-copy-clipboard>
+ </td>
+ <td>
<gr-button
data-index$="[[index]]"
on-click="_handleDeleteKey">Delete</gr-button>
diff --git a/polygerrit-ui/app/elements/settings/gr-gpg-editor/gr-gpg-editor_test.html b/polygerrit-ui/app/elements/settings/gr-gpg-editor/gr-gpg-editor_test.html
index c3cd8e1..9cfbde5f 100644
--- a/polygerrit-ui/app/elements/settings/gr-gpg-editor/gr-gpg-editor_test.html
+++ b/polygerrit-ui/app/elements/settings/gr-gpg-editor/gr-gpg-editor_test.html
@@ -97,7 +97,7 @@
// Get the delete button for the last row.
const button = Polymer.dom(element.root).querySelector(
- 'tbody tr:last-of-type td:nth-child(5) gr-button');
+ 'tbody tr:last-of-type td:nth-child(6) gr-button');
MockInteractions.tap(button);
diff --git a/polygerrit-ui/app/elements/settings/gr-ssh-editor/gr-ssh-editor.html b/polygerrit-ui/app/elements/settings/gr-ssh-editor/gr-ssh-editor.html
index 0ab1e64..e0030ba 100644
--- a/polygerrit-ui/app/elements/settings/gr-ssh-editor/gr-ssh-editor.html
+++ b/polygerrit-ui/app/elements/settings/gr-ssh-editor/gr-ssh-editor.html
@@ -19,6 +19,7 @@
<link rel="import" href="/bower_components/iron-autogrow-textarea/iron-autogrow-textarea.html">
<link rel="import" href="../../../styles/gr-form-styles.html">
<link rel="import" href="../../shared/gr-button/gr-button.html">
+<link rel="import" href="../../shared/gr-copy-clipboard/gr-copy-clipboard.html">
<link rel="import" href="../../shared/gr-overlay/gr-overlay.html">
<link rel="import" href="../../shared/gr-rest-api-interface/gr-rest-api-interface.html">
<link rel="import" href="../../../styles/shared-styles.html">
@@ -65,6 +66,7 @@
<th class="statusHeader">Status</th>
<th class="keyHeader">Public key</th>
<th></th>
+ <th></th>
</tr>
</thead>
<tbody>
@@ -80,6 +82,14 @@
link>Click to View</gr-button>
</td>
<td>
+ <gr-copy-clipboard
+ has-tooltip
+ button-title="Copy SSH public key to clipboard"
+ hide-input
+ text="[[key.ssh_public_key]]">
+ </gr-copy-clipboard>
+ </td>
+ <td>
<gr-button
link
data-index$="[[index]]"
diff --git a/polygerrit-ui/app/elements/settings/gr-ssh-editor/gr-ssh-editor_test.html b/polygerrit-ui/app/elements/settings/gr-ssh-editor/gr-ssh-editor_test.html
index 991f17c..d313f5a 100644
--- a/polygerrit-ui/app/elements/settings/gr-ssh-editor/gr-ssh-editor_test.html
+++ b/polygerrit-ui/app/elements/settings/gr-ssh-editor/gr-ssh-editor_test.html
@@ -88,7 +88,7 @@
// Get the delete button for the last row.
const button = Polymer.dom(element.root).querySelector(
- 'tbody tr:last-of-type td:nth-child(4) gr-button');
+ 'tbody tr:last-of-type td:nth-child(5) gr-button');
MockInteractions.tap(button);
