Add latest changes from gitlab-org/gitlab@master

5 files changed, 72 insertions, 69 deletions

diff --git a/app/assets/javascripts/access_tokens/components/access_token_table_app.vue b/app/assets/javascripts/access_tokens/components/access_token_table_app.vue
index cd64579a360..57a237c3e84 100644
--- a/app/assets/javascripts/access_tokens/components/access_token_table_app.vue
+++ b/app/assets/javascripts/access_tokens/components/access_token_table_app.vue
@@ -49,7 +49,9 @@ export default {
   ],
   data() {
     return {
-      activeAccessTokens: this.initialActiveAccessTokens,
+      activeAccessTokens: convertObjectPropsToCamelCase(this.initialActiveAccessTokens, {
+        deep: true,
+      }),
       currentPage: INITIAL_PAGE,
     };
   },
diff --git a/app/assets/javascripts/access_tokens/components/new_access_token_app.vue b/app/assets/javascripts/access_tokens/components/new_access_token_app.vue
index 6b52bd84656..12d695626d2 100644
--- a/app/assets/javascripts/access_tokens/components/new_access_token_app.vue
+++ b/app/assets/javascripts/access_tokens/components/new_access_token_app.vue
@@ -2,10 +2,13 @@
 import { GlAlert } from '@gitlab/ui';
 import { createAlert, VARIANT_INFO } from '~/flash';
 import { __, n__, sprintf } from '~/locale';
+import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import DomElementListener from '~/vue_shared/components/dom_element_listener.vue';
 import InputCopyToggleVisibility from '~/vue_shared/components/form/input_copy_toggle_visibility.vue';
 import { EVENT_ERROR, EVENT_SUCCESS, FORM_SELECTOR } from './constants';
 
+const convertEventDetail = (event) => convertObjectPropsToCamelCase(event.detail, { deep: true });
+
 export default {
   EVENT_ERROR,
   EVENT_SUCCESS,
@@ -68,7 +71,7 @@ export default {
     onError(event) {
       this.beforeDisplayResults();
 
-      const [{ errors }] = event.detail;
+      const [{ errors }] = convertEventDetail(event);
       this.errors = errors;
 
       this.submitButton.classList.remove('disabled');
@@ -76,7 +79,7 @@ export default {
     onSuccess(event) {
       this.beforeDisplayResults();
 
-      const [{ new_token: newToken }] = event.detail;
+      const [{ newToken }] = convertEventDetail(event);
       this.newToken = newToken;
 
       this.infoAlert = createAlert({ message: this.alertInfoMessage, variant: VARIANT_INFO });
diff --git a/app/assets/javascripts/access_tokens/index.js b/app/assets/javascripts/access_tokens/index.js
index 0a65cd360b1..5e8d95c2076 100644
--- a/app/assets/javascripts/access_tokens/index.js
+++ b/app/assets/javascripts/access_tokens/index.js
@@ -31,12 +31,7 @@ export const initAccessTokenTableApp = () => {
     sprintf(__('This user has no active %{accessTokenTypePlural}.'), { accessTokenTypePlural });
   const showRole = 'showRole' in el.dataset;
 
-  const initialActiveAccessTokens = convertObjectPropsToCamelCase(
-    JSON.parse(initialActiveAccessTokensJson),
-    {
-      deep: true,
-    },
-  );
+  const initialActiveAccessTokens = JSON.parse(initialActiveAccessTokensJson);
 
   return new Vue({
     el,
diff --git a/spec/frontend/access_tokens/components/access_token_table_app_spec.js b/spec/frontend/access_tokens/components/access_token_table_app_spec.js
index 0917544b40d..2fa14810578 100644
--- a/spec/frontend/access_tokens/components/access_token_table_app_spec.js
+++ b/spec/frontend/access_tokens/components/access_token_table_app_spec.js
@@ -12,7 +12,6 @@ describe('~/access_tokens/components/access_token_table_app', () => {
   const accessTokenType = 'personal access token';
   const accessTokenTypePlural = 'personal access tokens';
   const information = undefined;
-  const initialActiveAccessTokens = [];
   const noActiveTokensMessage = 'This user has no active personal access tokens.';
   const showRole = false;
 
@@ -49,7 +48,7 @@ describe('~/access_tokens/components/access_token_table_app', () => {
         accessTokenType,
         accessTokenTypePlural,
         information,
-        initialActiveAccessTokens,
+        initialActiveAccessTokens: defaultActiveAccessTokens,
         noActiveTokensMessage,
         showRole,
         ...props,
@@ -73,8 +72,8 @@ describe('~/access_tokens/components/access_token_table_app', () => {
     wrapper?.destroy();
   });
 
-  it('should render the `GlTable` with default empty message', () => {
-    createComponent();
+  it('should render an empty table with a default message', () => {
+    createComponent({ initialActiveAccessTokens: [] });
 
     const cells = findCells();
     expect(cells).toHaveLength(1);
@@ -83,22 +82,22 @@ describe('~/access_tokens/components/access_token_table_app', () => {
     );
   });
 
-  it('should render the `GlTable` with custom empty message', () => {
+  it('should render an empty table with a custom message', () => {
     const noTokensMessage = 'This group has no active access tokens.';
-    createComponent({ noActiveTokensMessage: noTokensMessage });
+    createComponent({ initialActiveAccessTokens: [], noActiveTokensMessage: noTokensMessage });
 
     const cells = findCells();
     expect(cells).toHaveLength(1);
     expect(cells.at(0).text()).toBe(noTokensMessage);
   });
 
-  it('should render an h5 element', () => {
+  it('should show a title indicating the amount of tokens', () => {
     createComponent();
 
     expect(wrapper.find('h5').text()).toBe(
       sprintf(__('Active %{accessTokenTypePlural} (%{totalAccessTokens})'), {
         accessTokenTypePlural,
-        totalAccessTokens: initialActiveAccessTokens.length,
+        totalAccessTokens: defaultActiveAccessTokens.length,
       }),
     );
   });
@@ -110,38 +109,34 @@ describe('~/access_tokens/components/access_token_table_app', () => {
     expect(wrapper.findByTestId('information-section').text()).toBe(info);
   });
 
-  it('should render the `GlTable` component with default 6 column headers', () => {
-    createComponent();
-
-    const headers = findHeaders();
-    expect(headers).toHaveLength(6);
-    [
-      __('Token name'),
-      __('Scopes'),
-      s__('AccessTokens|Created'),
-      __('Last Used'),
-      __('Expires'),
-      __('Action'),
-    ].forEach((text, index) => {
-      expect(headers.at(index).text()).toBe(text);
+  describe('table headers', () => {
+    it('should include `Action` column', () => {
+      createComponent();
+
+      const headers = findHeaders();
+      expect(headers.wrappers.map((header) => header.text())).toStrictEqual([
+        __('Token name'),
+        __('Scopes'),
+        s__('AccessTokens|Created'),
+        __('Last Used'),
+        __('Expires'),
+        __('Action'),
+      ]);
     });
-  });
 
-  it('should render the `GlTable` component with 7 headers', () => {
-    createComponent({ showRole: true });
+    it('should include `Role` column', () => {
+      createComponent({ showRole: true });
 
-    const headers = findHeaders();
-    expect(headers).toHaveLength(7);
-    [
-      __('Token name'),
-      __('Scopes'),
-      s__('AccessTokens|Created'),
-      __('Last Used'),
-      __('Expires'),
-      __('Role'),
-      __('Action'),
-    ].forEach((text, index) => {
-      expect(headers.at(index).text()).toBe(text);
+      const headers = findHeaders();
+      expect(headers.wrappers.map((header) => header.text())).toStrictEqual([
+        __('Token name'),
+        __('Scopes'),
+        s__('AccessTokens|Created'),
+        __('Last Used'),
+        __('Expires'),
+        __('Role'),
+        __('Action'),
+      ]);
     });
   });
 
@@ -159,8 +154,8 @@ describe('~/access_tokens/components/access_token_table_app', () => {
     expect(assistiveElement.text()).toBe(s__('AccessTokens|The last time a token was used'));
   });
 
-  it('updates the table after a success AJAX event', async () => {
-    createComponent({ showRole: true });
+  it('updates the table after new tokens are created', async () => {
+    createComponent({ initialActiveAccessTokens: [], showRole: true });
     await triggerSuccess();
 
     const cells = findCells();
@@ -200,13 +195,14 @@ describe('~/access_tokens/components/access_token_table_app', () => {
   });
 
   describe('when revoke_path is', () => {
-    beforeEach(() => {
-      createComponent({ showRole: true });
-    });
-
     describe('absent in all tokens', () => {
-      it('should not include `Action` column', async () => {
-        await triggerSuccess(defaultActiveAccessTokens.map(({ revoke_path, ...rest }) => rest));
+      it('should not include `Action` column', () => {
+        createComponent({
+          initialActiveAccessTokens: defaultActiveAccessTokens.map(
+            ({ revoke_path, ...rest }) => rest,
+          ),
+          showRole: true,
+        });
 
         const headers = findHeaders();
         expect(headers).toHaveLength(6);
@@ -225,11 +221,14 @@ describe('~/access_tokens/components/access_token_table_app', () => {
 
     it.each([{ revoke_path: null }, { revoke_path: undefined }])(
       '%p in some tokens, does not show revoke button',
-      async (input) => {
-        await triggerSuccess([
-          defaultActiveAccessTokens.map((data) => ({ ...data, ...input }))[0],
-          defaultActiveAccessTokens[1],
-        ]);
+      (input) => {
+        createComponent({
+          initialActiveAccessTokens: [
+            defaultActiveAccessTokens.map((data) => ({ ...data, ...input }))[0],
+            defaultActiveAccessTokens[1],
+          ],
+          showRole: true,
+        });
 
         expect(findHeaders().at(6).text()).toBe(__('Action'));
         expect(findCells().at(6).findComponent(GlButton).exists()).toBe(false);
@@ -239,7 +238,6 @@ describe('~/access_tokens/components/access_token_table_app', () => {
 
   it('sorts rows alphabetically', async () => {
     createComponent({ showRole: true });
-    await triggerSuccess();
 
     const cells = findCells();
 
@@ -258,7 +256,6 @@ describe('~/access_tokens/components/access_token_table_app', () => {
 
   it('sorts rows by date', async () => {
     createComponent({ showRole: true });
-    await triggerSuccess();
 
     const cells = findCells();
 
@@ -274,14 +271,20 @@ describe('~/access_tokens/components/access_token_table_app', () => {
     expect(cells.at(10).text()).toBe('Never');
   });
 
-  it('should show the pagination component when needed', async () => {
-    createComponent();
-    expect(findPagination().exists()).toBe(false);
+  describe('pagination', () => {
+    it('does not show pagination component', () => {
+      createComponent({
+        initialActiveAccessTokens: Array(PAGE_SIZE).fill(defaultActiveAccessTokens[0]),
+      });
 
-    await triggerSuccess(Array(PAGE_SIZE).fill(defaultActiveAccessTokens[0]));
-    expect(findPagination().exists()).toBe(false);
+      expect(findPagination().exists()).toBe(false);
+    });
 
-    await triggerSuccess(Array(PAGE_SIZE + 1).fill(defaultActiveAccessTokens[0]));
-    expect(findPagination().exists()).toBe(true);
+    it('shows the pagination component', () => {
+      createComponent({
+        initialActiveAccessTokens: Array(PAGE_SIZE + 1).fill(defaultActiveAccessTokens[0]),
+      });
+      expect(findPagination().exists()).toBe(true);
+    });
   });
 });
diff --git a/spec/frontend/access_tokens/index_spec.js b/spec/frontend/access_tokens/index_spec.js
index 55575ab25fc..dba6e73f278 100644
--- a/spec/frontend/access_tokens/index_spec.js
+++ b/spec/frontend/access_tokens/index_spec.js
@@ -28,7 +28,7 @@ describe('access tokens', () => {
   describe('initAccessTokenTableApp', () => {
     const accessTokenType = 'personal access token';
     const accessTokenTypePlural = 'personal access tokens';
-    const initialActiveAccessTokens = [{ id: '1' }];
+    const initialActiveAccessTokens = [{ revoked_path: '1' }];
 
     const FakeAccessTokenTableApp = Vue.component('FakeComponent', {
       inject: [