Add latest changes from gitlab-org/gitlab@master

7 files changed, 307 insertions, 17 deletions

diff --git a/spec/frontend/boards/stores/actions_spec.js b/spec/frontend/boards/stores/actions_spec.js
index 78859525a63..b3e90e34161 100644
--- a/spec/frontend/boards/stores/actions_spec.js
+++ b/spec/frontend/boards/stores/actions_spec.js
@@ -8,7 +8,6 @@ import {
   ListType,
   issuableTypes,
   BoardType,
-  listsQuery,
   DraggableItemTypes,
 } from 'ee_else_ce/boards/constants';
 import issueMoveListMutation from 'ee_else_ce/boards/graphql/issue_move_list.mutation.graphql';
@@ -21,7 +20,7 @@ import {
   getMoveData,
   updateListPosition,
 } from 'ee_else_ce/boards/boards_util';
-import { gqlClient } from '~/boards/graphql';
+import { defaultClient as gqlClient } from '~/graphql_shared/issuable_client';
 import destroyBoardListMutation from '~/boards/graphql/board_list_destroy.mutation.graphql';
 import issueCreateMutation from '~/boards/graphql/issue_create.mutation.graphql';
 import actions from '~/boards/stores/actions';
@@ -318,21 +317,18 @@ describe('fetchLists', () => {
       };
 
       const variables = {
-        query: listsQuery[issuableType].query,
-        variables: {
-          fullPath: 'gitlab-org',
-          boardId: fullBoardId,
-          filters: {},
-          isGroup,
-          isProject,
-        },
+        fullPath: 'gitlab-org',
+        boardId: fullBoardId,
+        filters: {},
+        isGroup,
+        isProject,
       };
 
       jest.spyOn(gqlClient, 'query').mockResolvedValue(queryResponse);
 
       await actions.fetchLists({ commit, state, dispatch });
 
-      expect(gqlClient.query).toHaveBeenCalledWith(variables);
+      expect(gqlClient.query).toHaveBeenCalledWith(expect.objectContaining({ variables }));
     },
   );
 });
diff --git a/spec/frontend/ml/experiment_tracking/components/__snapshots__/experiment_spec.js.snap b/spec/frontend/ml/experiment_tracking/components/__snapshots__/experiment_spec.js.snap
new file mode 100644
index 00000000000..2eba8869535
--- /dev/null
+++ b/spec/frontend/ml/experiment_tracking/components/__snapshots__/experiment_spec.js.snap
@@ -0,0 +1,223 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ShowExperiment with candidates renders correctly 1`] = `
+<div>
+  <div
+    class="gl-alert gl-alert-warning"
+  >
+    <svg
+      aria-hidden="true"
+      class="gl-icon s16 gl-alert-icon"
+      data-testid="warning-icon"
+      role="img"
+    >
+      <use
+        href="#warning"
+      />
+    </svg>
+     
+    <div
+      aria-live="assertive"
+      class="gl-alert-content"
+      role="alert"
+    >
+      <h2
+        class="gl-alert-title"
+      >
+        Machine Learning Experiment Tracking is in Incubating Phase
+      </h2>
+       
+      <div
+        class="gl-alert-body"
+      >
+        
+  GitLab incubates features to explore new use cases. These features are updated regularly, and support is limited
+  
+        <a
+          class="gl-link"
+          href="https://about.gitlab.com/handbook/engineering/incubation/"
+          rel="noopener noreferrer"
+          target="_blank"
+        >
+          Learn More
+        </a>
+      </div>
+       
+      <div
+        class="gl-alert-actions"
+      >
+        <a
+          class="btn gl-alert-action btn-confirm btn-md gl-button"
+          href="https://gitlab.com/groups/gitlab-org/-/epics/8560"
+        >
+          <!---->
+           
+          <!---->
+            
+          <span
+            class="gl-button-text"
+          >
+            
+          Feedback and Updates
+        
+          </span>
+        </a>
+      </div>
+    </div>
+     
+    <button
+      aria-label="Dismiss"
+      class="btn gl-dismiss-btn btn-default btn-sm gl-button btn-default-tertiary btn-icon"
+      type="button"
+    >
+      <!---->
+       
+      <svg
+        aria-hidden="true"
+        class="gl-button-icon gl-icon s16"
+        data-testid="close-icon"
+        role="img"
+      >
+        <use
+          href="#close"
+        />
+      </svg>
+        
+      <!---->
+    </button>
+  </div>
+   
+  <h3>
+    
+    Experiment Candidates
+  
+  </h3>
+   
+  <table
+    aria-busy="false"
+    aria-colcount="4"
+    class="table b-table gl-table gl-mt-0!"
+    role="table"
+  >
+    <!---->
+    <!---->
+    <thead
+      class=""
+      role="rowgroup"
+    >
+      <!---->
+      <tr
+        class=""
+        role="row"
+      >
+        <th
+          aria-colindex="1"
+          class=""
+          role="columnheader"
+          scope="col"
+        >
+          <div>
+            L1 Ratio
+          </div>
+        </th>
+        <th
+          aria-colindex="2"
+          class=""
+          role="columnheader"
+          scope="col"
+        >
+          <div>
+            Rmse
+          </div>
+        </th>
+        <th
+          aria-colindex="3"
+          class=""
+          role="columnheader"
+          scope="col"
+        >
+          <div>
+            Auc
+          </div>
+        </th>
+        <th
+          aria-colindex="4"
+          class=""
+          role="columnheader"
+          scope="col"
+        >
+          <div>
+            Mae
+          </div>
+        </th>
+      </tr>
+    </thead>
+    <tbody
+      role="rowgroup"
+    >
+      <!---->
+      <tr
+        class=""
+        role="row"
+      >
+        <td
+          aria-colindex="1"
+          class=""
+          role="cell"
+        >
+          0.4
+        </td>
+        <td
+          aria-colindex="2"
+          class=""
+          role="cell"
+        >
+          1
+        </td>
+        <td
+          aria-colindex="3"
+          class=""
+          role="cell"
+        />
+        <td
+          aria-colindex="4"
+          class=""
+          role="cell"
+        />
+      </tr>
+      <tr
+        class=""
+        role="row"
+      >
+        <td
+          aria-colindex="1"
+          class=""
+          role="cell"
+        >
+          0.5
+        </td>
+        <td
+          aria-colindex="2"
+          class=""
+          role="cell"
+        />
+        <td
+          aria-colindex="3"
+          class=""
+          role="cell"
+        >
+          0.3
+        </td>
+        <td
+          aria-colindex="4"
+          class=""
+          role="cell"
+        />
+      </tr>
+      <!---->
+      <!---->
+    </tbody>
+    <!---->
+  </table>
+</div>
+`;
diff --git a/spec/frontend/ml/experiment_tracking/components/experiment_spec.js b/spec/frontend/ml/experiment_tracking/components/experiment_spec.js
new file mode 100644
index 00000000000..af722d77532
--- /dev/null
+++ b/spec/frontend/ml/experiment_tracking/components/experiment_spec.js
@@ -0,0 +1,44 @@
+import { GlAlert } from '@gitlab/ui';
+import { mountExtended } from 'helpers/vue_test_utils_helper';
+import ShowExperiment from '~/ml/experiment_tracking/components/experiment.vue';
+
+describe('ShowExperiment', () => {
+  let wrapper;
+
+  const createWrapper = (candidates = [], metricNames = [], paramNames = []) => {
+    return mountExtended(ShowExperiment, { provide: { candidates, metricNames, paramNames } });
+  };
+
+  const findAlert = () => wrapper.findComponent(GlAlert);
+
+  const findEmptyState = () => wrapper.findByText('This Experiment has no logged Candidates');
+
+  it('shows incubation warning', () => {
+    wrapper = createWrapper();
+
+    expect(findAlert().exists()).toBe(true);
+  });
+
+  describe('no candidates', () => {
+    it('shows empty state', () => {
+      wrapper = createWrapper();
+
+      expect(findEmptyState().exists()).toBe(true);
+    });
+  });
+
+  describe('with candidates', () => {
+    it('renders correctly', () => {
+      wrapper = createWrapper(
+        [
+          { rmse: 1, l1_ratio: 0.4 },
+          { auc: 0.3, l1_ratio: 0.5 },
+        ],
+        ['rmse', 'auc', 'mae'],
+        ['l1_ratio'],
+      );
+
+      expect(wrapper.element).toMatchSnapshot();
+    });
+  });
+});
diff --git a/spec/frontend/ml/experiment_tracking/components/incubation_alert_spec.js b/spec/frontend/ml/experiment_tracking/components/incubation_alert_spec.js
new file mode 100644
index 00000000000..e07a4ed816b
--- /dev/null
+++ b/spec/frontend/ml/experiment_tracking/components/incubation_alert_spec.js
@@ -0,0 +1,27 @@
+import { mount } from '@vue/test-utils';
+import { GlAlert, GlButton } from '@gitlab/ui';
+import IncubationAlert from '~/ml/experiment_tracking/components/incubation_alert.vue';
+
+describe('IncubationAlert', () => {
+  let wrapper;
+
+  const findAlert = () => wrapper.findComponent(GlAlert);
+
+  const findButton = () => wrapper.findComponent(GlButton);
+
+  beforeEach(() => {
+    wrapper = mount(IncubationAlert);
+  });
+
+  it('displays link to issue', () => {
+    expect(findButton().attributes().href).toBe(
+      'https://gitlab.com/groups/gitlab-org/-/epics/8560',
+    );
+  });
+
+  it('is removed if dismissed', async () => {
+    await wrapper.find('[aria-label="Dismiss"]').trigger('click');
+
+    expect(findAlert().exists()).toBe(false);
+  });
+});
diff --git a/spec/frontend/work_items/components/work_item_assignees_spec.js b/spec/frontend/work_items/components/work_item_assignees_spec.js
index 1b204b6fd60..7367212e49f 100644
--- a/spec/frontend/work_items/components/work_item_assignees_spec.js
+++ b/spec/frontend/work_items/components/work_item_assignees_spec.js
@@ -8,7 +8,7 @@ import { mockTracking } from 'helpers/tracking_helper';
 import { DEFAULT_DEBOUNCE_AND_THROTTLE_MS } from '~/lib/utils/constants';
 import userSearchQuery from '~/graphql_shared/queries/users_search.query.graphql';
 import currentUserQuery from '~/graphql_shared/queries/current_user.query.graphql';
-import { temporaryConfig } from '~/graphql_shared/issuable_client';
+import { config } from '~/graphql_shared/issuable_client';
 import InviteMembersTrigger from '~/invite_members/components/invite_members_trigger.vue';
 import workItemQuery from '~/work_items/graphql/work_item.query.graphql';
 import updateWorkItemMutation from '~/work_items/graphql/update_work_item.mutation.graphql';
@@ -86,7 +86,7 @@ describe('WorkItemAssignees component', () => {
       ],
       {},
       {
-        typePolicies: temporaryConfig.cacheConfig.typePolicies,
+        typePolicies: config.cacheConfig.typePolicies,
       },
     );
 
diff --git a/spec/frontend/work_items/components/work_item_detail_spec.js b/spec/frontend/work_items/components/work_item_detail_spec.js
index aae61b11196..1e22fb42a83 100644
--- a/spec/frontend/work_items/components/work_item_detail_spec.js
+++ b/spec/frontend/work_items/components/work_item_detail_spec.js
@@ -29,7 +29,7 @@ import workItemTitleSubscription from '~/work_items/graphql/work_item_title.subs
 import workItemAssigneesSubscription from '~/work_items/graphql/work_item_assignees.subscription.graphql';
 import updateWorkItemMutation from '~/work_items/graphql/update_work_item.mutation.graphql';
 import updateWorkItemTaskMutation from '~/work_items/graphql/update_work_item_task.mutation.graphql';
-import { temporaryConfig } from '~/graphql_shared/issuable_client';
+import { config } from '~/graphql_shared/issuable_client';
 import { useLocalStorageSpy } from 'helpers/local_storage_helper';
 import {
   mockParent,
@@ -101,7 +101,7 @@ describe('WorkItemDetail component', () => {
         handlers,
         {},
         {
-          typePolicies: includeWidgets ? temporaryConfig.cacheConfig.typePolicies : {},
+          typePolicies: includeWidgets ? config.cacheConfig.typePolicies : {},
         },
       ),
       propsData: { isModal, workItemId },
diff --git a/spec/frontend/work_items/components/work_item_milestone_spec.js b/spec/frontend/work_items/components/work_item_milestone_spec.js
index 08cdf62ae52..e5713efdbec 100644
--- a/spec/frontend/work_items/components/work_item_milestone_spec.js
+++ b/spec/frontend/work_items/components/work_item_milestone_spec.js
@@ -9,7 +9,7 @@ import {
 import Vue, { nextTick } from 'vue';
 import VueApollo from 'vue-apollo';
 import WorkItemMilestone from '~/work_items/components/work_item_milestone.vue';
-import { resolvers, temporaryConfig } from '~/graphql_shared/issuable_client';
+import { resolvers, config } from '~/graphql_shared/issuable_client';
 import createMockApollo from 'helpers/mock_apollo_helper';
 import { mockTracking } from 'helpers/tracking_helper';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
@@ -72,7 +72,7 @@ describe('WorkItemMilestone component', () => {
       [[projectMilestonesQuery, searchQueryHandler]],
       resolvers,
       {
-        typePolicies: temporaryConfig.cacheConfig.typePolicies,
+        typePolicies: config.cacheConfig.typePolicies,
       },
     );