Add latest changes from gitlab-org/gitlab@master

4 files changed, 16 insertions, 29 deletions

diff --git a/app/assets/javascripts/ci/job_details/index.js b/app/assets/javascripts/ci/job_details/index.js
index 5a1ecf2fff3..20235015ce6 100644
--- a/app/assets/javascripts/ci/job_details/index.js
+++ b/app/assets/javascripts/ci/job_details/index.js
@@ -13,11 +13,11 @@ const apolloProvider = new VueApollo({
   defaultClient: createDefaultClient(),
 });
 
-const initializeJobPage = (element) => {
-  const store = createStore();
-
-  // Let's start initializing the store (i.e. fetching data) right away
-  store.dispatch('init', element.dataset);
+export const initJobDetails = () => {
+  const el = document.getElementById('js-job-page');
+  if (!el) {
+    return null;
+  }
 
   const {
     artifactHelpUrl,
@@ -26,27 +26,27 @@ const initializeJobPage = (element) => {
     subscriptionsMoreMinutesUrl,
     endpoint,
     pagePath,
-    logState,
     buildStatus,
     projectPath,
     retryOutdatedJobDocsUrl,
     aiRootCauseAnalysisAvailable,
-  } = element.dataset;
+  } = el.dataset;
+
+  // init store to start fetching log
+  const store = createStore();
+  store.dispatch('init', { endpoint, pagePath });
 
   return new Vue({
-    el: element,
+    el,
     apolloProvider,
     store,
-    components: {
-      JobApp,
-    },
     provide: {
       projectPath,
       retryOutdatedJobDocsUrl,
       aiRootCauseAnalysisAvailable: parseBoolean(aiRootCauseAnalysisAvailable),
     },
-    render(createElement) {
-      return createElement('job-app', {
+    render(h) {
+      return h(JobApp, {
         props: {
           artifactHelpUrl,
           deploymentHelpUrl,
@@ -54,7 +54,6 @@ const initializeJobPage = (element) => {
           subscriptionsMoreMinutesUrl,
           endpoint,
           pagePath,
-          logState,
           buildStatus,
           projectPath,
         },
@@ -62,8 +61,3 @@ const initializeJobPage = (element) => {
     },
   });
 };
-
-export default () => {
-  const jobElement = document.getElementById('js-job-page');
-  initializeJobPage(jobElement);
-};
diff --git a/app/assets/javascripts/ci/job_details/store/actions.js b/app/assets/javascripts/ci/job_details/store/actions.js
index 33d83689e61..fa23589f7d6 100644
--- a/app/assets/javascripts/ci/job_details/store/actions.js
+++ b/app/assets/javascripts/ci/job_details/store/actions.js
@@ -15,17 +15,15 @@ import { __ } from '~/locale';
 import { reportToSentry } from '~/ci/utils';
 import * as types from './mutation_types';
 
-export const init = ({ dispatch }, { endpoint, logState, pagePath }) => {
-  dispatch('setJobEndpoint', endpoint);
+export const init = ({ dispatch }, { endpoint, pagePath }) => {
   dispatch('setJobLogOptions', {
-    logState,
+    endpoint,
     pagePath,
   });
 
   return dispatch('fetchJob');
 };
 
-export const setJobEndpoint = ({ commit }, endpoint) => commit(types.SET_JOB_ENDPOINT, endpoint);
 export const setJobLogOptions = ({ commit }, options) => commit(types.SET_JOB_LOG_OPTIONS, options);
 
 export const hideSidebar = ({ commit }) => commit(types.HIDE_SIDEBAR);
diff --git a/app/assets/javascripts/ci/job_details/store/mutation_types.js b/app/assets/javascripts/ci/job_details/store/mutation_types.js
index 4915a826b84..e125538317d 100644
--- a/app/assets/javascripts/ci/job_details/store/mutation_types.js
+++ b/app/assets/javascripts/ci/job_details/store/mutation_types.js
@@ -1,4 +1,3 @@
-export const SET_JOB_ENDPOINT = 'SET_JOB_ENDPOINT';
 export const SET_JOB_LOG_OPTIONS = 'SET_JOB_LOG_OPTIONS';
 
 export const HIDE_SIDEBAR = 'HIDE_SIDEBAR';
diff --git a/app/assets/javascripts/ci/job_details/store/mutations.js b/app/assets/javascripts/ci/job_details/store/mutations.js
index b7d7006ee61..fe6506bf8a5 100644
--- a/app/assets/javascripts/ci/job_details/store/mutations.js
+++ b/app/assets/javascripts/ci/job_details/store/mutations.js
@@ -3,13 +3,9 @@ import * as types from './mutation_types';
 import { logLinesParser, updateIncrementalJobLog } from './utils';
 
 export default {
-  [types.SET_JOB_ENDPOINT](state, endpoint) {
-    state.jobEndpoint = endpoint;
-  },
-
   [types.SET_JOB_LOG_OPTIONS](state, options = {}) {
     state.jobLogEndpoint = options.pagePath;
-    state.jobLogState = options.logState;
+    state.jobEndpoint = options.endpoint;
   },
 
   [types.HIDE_SIDEBAR](state) {