Merge pull request #1447 from appknox/PD-1456-service-account-ui-mino…

…r-update-fixes service account ui minor updates and fixes
appknox · Sep 11, 2024 · 181263f · 181263f
2 parents 1a66538 + 6c75927
commit 181263f
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 29 deletions.
diff --git a/app/components/organization/service-account/list/index.ts b/app/components/organization/service-account/list/index.ts
@@ -57,7 +57,7 @@ export default class OrganizationServiceAccountListComponent extends Component<O
         valuePath: 'name',
       },
       {
-        name: this.intl.t('accountID'),
+        name: this.intl.t('accessKeyID'),
         valuePath: 'accessKeyId',
         width: 150,
       },

diff --git a/app/components/organization/service-account/section/access-token/index.hbs b/app/components/organization/service-account/section/access-token/index.hbs
@@ -119,17 +119,36 @@
           data-test-serviceAccountSection-accessToken-accountIdLabel
           @variant='subtitle1'
         >
-          {{t 'accountID'}}
+          {{t 'accessKeyID'}}
         </AkTypography>
 
         {{#if this.regenerateKey.isRunning}}
           <AkSkeleton @width='160px' />
         {{else}}
-          <AkTypography
-            data-test-serviceAccountSection-accessToken-accountIdValue
-          >
-            {{@serviceAccount.accessKeyId}}
-          </AkTypography>
+          <AkStack @width='full' @alignItems='center' @spacing='1'>
+            <AkTypography
+              data-test-serviceAccountSection-accessToken-accountIdValue
+            >
+              {{@serviceAccount.accessKeyId}}
+            </AkTypography>
+
+            {{#if this.secretAccessKeyVisible}}
+              <AkClipboard
+                @onSuccess={{this.handleCopySuccess}}
+                @onError={{this.handleCopyError}}
+                as |ac|
+              >
+                <AkIconButton
+                  data-test-serviceAccountSection-accessToken-accountIdCopyBtn
+                  data-clipboard-text={{@serviceAccount.accessKeyId}}
+                  id={{ac.triggerId}}
+                  @size='small'
+                >
+                  <AkIcon @iconName='content-copy' @color='primary' />
+                </AkIconButton>
+              </AkClipboard>
+            {{/if}}
+          </AkStack>
         {{/if}}
       </AkStack>
 
@@ -138,7 +157,7 @@
           @variant='subtitle1'
           data-test-serviceAccountSection-accessToken-secretKeyLabel
         >
-          {{t 'serviceAccountModule.secretAccountKey'}}
+          {{t 'serviceAccountModule.secretAccessKey'}}
         </AkTypography>
 
         {{#if this.regenerateKey.isRunning}}

diff --git a/app/components/organization/service-account/section/access-token/index.ts b/app/components/organization/service-account/section/access-token/index.ts
@@ -78,8 +78,8 @@ export default class OrganizationServiceAccountSectionAccessTokenComponent exten
 
   get secretAccessKeyHelperText() {
     return this.secretAccessKeyVisible
-      ? this.intl.t('serviceAccountModule.unmaskedSecretAccountKeyHelperText')
-      : this.intl.t('serviceAccountModule.maskedSecretAccountKeyHelperText');
+      ? this.intl.t('serviceAccountModule.unmaskedSecretAccessKeyHelperText')
+      : this.intl.t('serviceAccountModule.maskedSecretAccessKeyHelperText');
   }
 
   setCreateServiceAccountExpiry() {

diff --git a/tests/acceptance/organization/create-service-account-test.js b/tests/acceptance/organization/create-service-account-test.js
@@ -717,7 +717,7 @@ module('Acceptance | Create service account', function (hooks) {
         .dom(
           '[data-test-serviceAccountSection-accessToken-secretKeyHelperText]'
         )
-        .hasText(t('serviceAccountModule.unmaskedSecretAccountKeyHelperText'));
+        .hasText(t('serviceAccountModule.unmaskedSecretAccessKeyHelperText'));
 
       assert
         .dom('[data-test-serviceAccountSection-accessToken-secretKeyCopyBtn]')

diff --git a/tests/acceptance/organization/service-account-test.js b/tests/acceptance/organization/service-account-test.js
@@ -150,7 +150,7 @@ module('Acceptance | Organization Service Account List', function (hooks) {
       assert.strictEqual(headerCells.length, 5);
 
       assert.dom(headerCells[0]).hasText(t('accountName'));
-      assert.dom(headerCells[1]).hasText(t('accountID'));
+      assert.dom(headerCells[1]).hasText(t('accessKeyID'));
       assert.dom(headerCells[2]).hasText(t('expiryOn'));
       assert.dom(headerCells[3]).hasText(t('createdBy'));
       assert.dom(headerCells[4]).hasText(t('action'));

diff --git a/tests/integration/components/organization/service-account/details-test.js b/tests/integration/components/organization/service-account/details-test.js
@@ -147,15 +147,15 @@ module(
 
       assert
         .dom('[data-test-serviceAccountSection-accessToken-accountIdLabel]')
-        .hasText('t:accountID:()');
+        .hasText('t:accessKeyID:()');
 
       assert
         .dom('[data-test-serviceAccountSection-accessToken-accountIdValue]')
         .hasText(this.serviceAccount.accessKeyId);
 
       assert
         .dom('[data-test-serviceAccountSection-accessToken-secretKeyLabel]')
-        .hasText('t:serviceAccountModule.secretAccountKey:()');
+        .hasText('t:serviceAccountModule.secretAccessKey:()');
 
       assert
         .dom('[data-test-serviceAccountSection-accessToken-secretKeyMasked]')
@@ -165,7 +165,7 @@ module(
         .dom(
           '[data-test-serviceAccountSection-accessToken-secretKeyHelperText]'
         )
-        .hasText('t:serviceAccountModule.maskedSecretAccountKeyHelperText:()');
+        .hasText('t:serviceAccountModule.maskedSecretAccessKeyHelperText:()');
 
       assert
         .dom('[data-test-serviceAccountSection-accessToken-expiryLabel]')

diff --git a/tests/integration/components/organization/service-account/section/access-token-test.js b/tests/integration/components/organization/service-account/section/access-token-test.js
@@ -74,15 +74,15 @@ module(
 
         assert
           .dom('[data-test-serviceAccountSection-accessToken-accountIdLabel]')
-          .hasText('t:accountID:()');
+          .hasText('t:accessKeyID:()');
 
         assert
           .dom('[data-test-serviceAccountSection-accessToken-accountIdValue]')
           .hasText(this.serviceAccount.accessKeyId);
 
         assert
           .dom('[data-test-serviceAccountSection-accessToken-secretKeyLabel]')
-          .hasText('t:serviceAccountModule.secretAccountKey:()');
+          .hasText('t:serviceAccountModule.secretAccessKey:()');
 
         assert
           .dom('[data-test-serviceAccountSection-accessToken-secretKeyMasked]')
@@ -92,9 +92,7 @@ module(
           .dom(
             '[data-test-serviceAccountSection-accessToken-secretKeyHelperText]'
           )
-          .hasText(
-            't:serviceAccountModule.maskedSecretAccountKeyHelperText:()'
-          );
+          .hasText('t:serviceAccountModule.maskedSecretAccessKeyHelperText:()');
 
         assert
           .dom('[data-test-serviceAccountSection-accessToken-expiryLabel]')
@@ -285,7 +283,7 @@ module(
               '[data-test-serviceAccountSection-accessToken-secretKeyHelperText]'
             )
             .hasText(
-              't:serviceAccountModule.unmaskedSecretAccountKeyHelperText:()'
+              't:serviceAccountModule.unmaskedSecretAccessKeyHelperText:()'
             );
 
           assert

diff --git a/translations/en.json b/translations/en.json
@@ -6,7 +6,7 @@
   "accessRequested": "Removal for the restriction has been requested, please wait for our team to revert",
   "accessToken": "Access Token",
   "account": "Account",
-  "accountID": "Account ID",
+  "accessKeyID": "Access Key ID",
   "accountName": "Account Name",
   "accountOverview": "Account Overview",
   "accountSettings": "Account Settings",
@@ -1368,9 +1368,9 @@
     "refreshAccessToken": "Refresh Access Token",
     "accessTokenEditDescription": "You can regenerate the secret key here. Ensure you copy the token immediately as it will not be visible when you access this page again.",
     "accessTokenCreateDescription": "Access Token will be visible in this section once you Save this page. Ensure you copy the token immediately as it will not be visible when you access this page again.",
-    "secretAccountKey": "Secret Account Key",
-    "unmaskedSecretAccountKeyHelperText": "Please copy the Secret Account Key immediately. This will not be available later.",
-    "maskedSecretAccountKeyHelperText": "Can't view the secret account key again but you can regenerate again for a new secret account key.",
+    "secretAccessKey": "Secret Access Key",
+    "unmaskedSecretAccessKeyHelperText": "Please copy the Secret Access Key immediately. This will not be available later.",
+    "maskedSecretAccessKeyHelperText": "Can't view the secret access key again but you can regenerate again for a new secret access key.",
     "doesNotExpire": "Does not expire",
     "doesNotExpireHelperText": "* This token will not expire",
     "expiryHelperText": "* This token will expire on {date}",

diff --git a/translations/ja.json b/translations/ja.json
@@ -6,7 +6,7 @@
   "accessRequested": "Removal for the restriction has been requested, please wait for our team to revert",
   "accessToken": "Access Token",
   "account": "アカウント",
-  "accountID": "Account ID",
+  "accessKeyID": "Access Key ID",
   "accountName": "Account Name",
   "accountOverview": "アカウントの概要",
   "accountSettings": "アカウント設定",
@@ -1368,9 +1368,9 @@
     "refreshAccessToken": "Refresh Access Token",
     "accessTokenEditDescription": "You can regenerate the secret key here. Ensure you copy the token immediately as it will not be visible when you access this page again.",
     "accessTokenCreateDescription": "Access Token will be visible in this section once you Save this page. Ensure you copy the token immediately as it will not be visible when you access this page again.",
-    "secretAccountKey": "Secret Account Key",
-    "unmaskedSecretAccountKeyHelperText": "Please copy the Secret Account Key immediately. This will not be available later.",
-    "maskedSecretAccountKeyHelperText": "Can't view the secret account key again but you can regenerate again for a new secret account key.",
+    "secretAccessKey": "Secret Access Key",
+    "unmaskedSecretAccessKeyHelperText": "Please copy the Secret Access Key immediately. This will not be available later.",
+    "maskedSecretAccessKeyHelperText": "Can't view the secret access key again but you can regenerate again for a new secret access key.",
     "doesNotExpire": "Does not expire",
     "doesNotExpireHelperText": "* This token will not expire",
     "expiryHelperText": "* This token will expire on {date}",