KYLIN-3918: Add project name in cube and job pages

core-job/src/main/java/org/apache/kylin/job/JobInstance.java

@@ -46,7 +46,8 @@ public class JobInstance extends RootPersistentEntity implements Comparable<JobI
 
     @JsonProperty("name")
     private String name;
-
+    @JsonProperty("projectName")
+    private String projectName;
     @JsonProperty("type")
     private CubeBuildTypeEnum type; // java implementation
     @JsonProperty("duration")
@@ -157,6 +158,14 @@ public void setName(String name) {
         this.name = name;
     }
 
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
     public CubeBuildTypeEnum getType() {
         return type;
     }

engine-mr/src/main/java/org/apache/kylin/engine/mr/common/JobInfoConverter.java

@@ -79,6 +79,7 @@ public static JobInstance parseToJobInstance(CubingJob job, Map<String, Output>
 
         final JobInstance result = new JobInstance();
         result.setName(job.getName());
+        result.setProjectName(cubeJob.getProjectName());
         result.setRelatedCube(cube != null ? cube.getName() : CubingExecutableUtil.getCubeName(cubeJob.getParams()));
         result.setDisplayCubeName(cube != null ? cube.getDisplayName() : CubingExecutableUtil.getCubeName(cubeJob.getParams()));
         result.setRelatedSegment(CubingExecutableUtil.getSegmentId(cubeJob.getParams()));
@@ -115,6 +116,7 @@ public static JobInstance parseToJobInstance(CheckpointExecutable job, Map<Strin
 
         final JobInstance result = new JobInstance();
         result.setName(job.getName());
+        result.setProjectName(job.getProjectName());
         result.setRelatedCube(CubingExecutableUtil.getCubeName(job.getParams()));
         result.setDisplayCubeName(CubingExecutableUtil.getCubeName(job.getParams()));
         result.setLastModified(output.getLastModified());

server-base/src/main/java/org/apache/kylin/rest/service/JobService.java

@@ -479,6 +479,7 @@ protected JobInstance getSingleJobInstance(AbstractExecutable job) {
         Output output = cubeJob.getOutput();
         final JobInstance result = new JobInstance();
         result.setName(job.getName());
+        result.setProjectName(cubeJob.getProjectName());
         if (cube != null) {
             result.setRelatedCube(cube.getName());
             result.setDisplayCubeName(cube.getDisplayName());
@@ -513,6 +514,7 @@ protected JobInstance getLookupSnapshotBuildJobInstance(LookupSnapshotBuildJob j
         Output output = job.getOutput();
         final JobInstance result = new JobInstance();
         result.setName(job.getName());
+        result.setProjectName(job.getProjectName());
         result.setRelatedCube(CubingExecutableUtil.getCubeName(job.getParams()));
         result.setRelatedSegment(CubingExecutableUtil.getSegmentId(job.getParams()));
         result.setLastModified(job.getLastModified());
@@ -546,6 +548,7 @@ protected JobInstance getCheckpointJobInstance(AbstractExecutable job) {
         Output output = checkpointExecutable.getOutput();
         final JobInstance result = new JobInstance();
         result.setName(job.getName());
+        result.setProjectName(checkpointExecutable.getProjectName());
         result.setRelatedCube(CubingExecutableUtil.getCubeName(job.getParams()));
         result.setDisplayCubeName(CubingExecutableUtil.getCubeName(job.getParams()));
         result.setLastModified(job.getLastModified());

tool/src/main/java/org/apache/kylin/tool/JobInstanceExtractor.java

@@ -130,6 +130,7 @@ private JobInstance parseToJobInstance(CubingJob cubeJob, Map<String, Output> ou
         Output output = outputs.get(cubeJob.getId());
         final JobInstance result = new JobInstance();
         result.setName(cubeJob.getName());
+        result.setProjectName(cubeJob.getProjectName());
         if (cube != null) {
             result.setRelatedCube(cube.getName());
             result.setDisplayCubeName(cube.getDisplayName());

webapp/app/js/model/cubeConfig.js

@@ -80,6 +80,7 @@ KylinApp.constant('cubeConfig', {
   theaditems: [
     {attr: 'name', name: 'Name'},
     {attr: 'status', name: 'Status'},
+    {attr: 'project', name: 'Project'},
     {attr: 'size_kb', name: 'Cube Size'},
     {attr: 'input_records_count', name: 'Source Records'},
     {attr: 'last_build_time', name: 'Last Build Time'},
@@ -200,4 +201,4 @@ KylinApp.constant('cubeConfig', {
       'left': '-12px'
     }
   }
-});
+});

webapp/app/partials/cubes/cubes.html

@@ -70,6 +70,7 @@
                     {{ cube.status}}
                 </span>
             </td>
+            <td>{{ cube.project}}</td>
             <td><span tooltip-html-unsafe="<div style='text-align:left'>
                 Source Table Size: {{dataSize(cube.input_records_size)}}<br/>
                 Expansion Rate: {{(cube.input_records_size>0? cube.size_kb*1024/cube.input_records_size : 0) * 100 | number:2}}%

webapp/app/partials/jobs/job_steps.html

@@ -40,6 +40,12 @@
                                 {{state.selectedJob.uuid}}
                             </td>
                         </tr>
+                        <tr>
+                          <td><b>Project Name</b></td>
+                          <td style="max-width: 180px;word-wrap: break-word;word-break: normal;">
+                            {{state.selectedJob.projectName}}
+                          </td>
+                        </tr>
                         <tr>
                             <td><b>Status</b></td>
                             <td>