gitlab-radiator 4.1.4 → 4.2.0

package/public/client.less

@@ -228,6 +228,38 @@ ol.jobs {
   }
 }
 
+.horizontal {
+  .stages {
+    flex-direction: column;
+    flex-wrap: nowrap;
+    flex-grow: 1;
+
+    .stage {
+      flex-wrap: nowrap;
+      align-items: flex-start;
+      flex-direction: row;
+
+      .name {
+        min-width: 170px;
+        margin-top: 6px;
+      }
+
+      .jobs {
+        flex-direction: row;
+        flex-wrap: wrap;
+    
+        li {
+          margin-right: 5px;
+        }
+    
+        :last-child {
+          margin-bottom: 5px;
+        }
+      }
+    }
+  }
+}
+
 ol.groups {
   list-style: none;
   width: 100vmax;

package/src/app.js

@@ -36,6 +36,7 @@ const globalState = {
   zoom: config.zoom,
   projectsOrder: config.projectsOrder,
   columns: config.columns,
+  horizontal: config.horizontal,
   groupSuccessfulProjects: config.groupSuccessfulProjects
 }
 

package/src/config.js

@@ -11,6 +11,7 @@ config.interval = Number(config.interval || 10) * 1000
 config.port = Number(config.port || 3000)
 config.zoom = Number(config.zoom || 1.0)
 config.columns = Number(config.columns || 1)
+config.horizontal = config.horizontal || false
 config.groupSuccessfulProjects = config.groupSuccessfulProjects || false
 config.projectsOrder = config.projectsOrder || ['name']
 config.gitlabs = config.gitlabs.map((gitlab) => {

package/src/gitlab/pipelines.js

@@ -44,11 +44,11 @@ async function fetchPipelines(projectId, config, options) {
 
 async function fetchDownstreamJobs(projectId, pipelineId, config) {
   const {data: gitlabBridgeJobs} = await gitlabRequest(`/projects/${projectId}/pipelines/${pipelineId}/bridges`, {per_page: 100}, config)
-  const childPipelines = gitlabBridgeJobs.filter(bridge => bridge.downstream_pipeline.status !== 'skipped')
+  const childPipelines = gitlabBridgeJobs.filter(bridge => bridge.downstream_pipeline !== null && bridge.downstream_pipeline.status !== 'skipped')
 
   const downstreamStages = []
   for(const childPipeline of childPipelines) {
-    const {stages} = await fetchJobs(projectId, childPipeline.downstream_pipeline.id, config)
+    const {stages} = await fetchJobs(childPipeline.downstream_pipeline.project_id, childPipeline.downstream_pipeline.id, config)
     downstreamStages.push(stages.map(stage => ({
       ...stage,
       name: `${childPipeline.stage}:${stage.name}`
@@ -60,7 +60,7 @@ async function fetchDownstreamJobs(projectId, pipelineId, config) {
 async function fetchJobs(projectId, pipelineId, config) {
   const {data: gitlabJobs} = await gitlabRequest(`/projects/${projectId}/pipelines/${pipelineId}/jobs?include_retried=true`, {per_page: 100}, config)
   if (gitlabJobs.length === 0) {
-    return {}
+    return {commit: undefined, stages: []}
   }
 
   const commit = findCommit(gitlabJobs)