From issues-return-16668-archive-asf-public=cust-asf.ponee.io@kylin.apache.org Thu Mar 1 03:30:05 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id C2DD0180671 for ; Thu, 1 Mar 2018 03:30:04 +0100 (CET) Received: (qmail 58813 invoked by uid 500); 1 Mar 2018 02:30:03 -0000 Mailing-List: contact issues-help@kylin.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kylin.apache.org Delivered-To: mailing list issues@kylin.apache.org Received: (qmail 58652 invoked by uid 99); 1 Mar 2018 02:30:03 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Mar 2018 02:30:03 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 046591804BD for ; Thu, 1 Mar 2018 02:30:03 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -109.511 X-Spam-Level: X-Spam-Status: No, score=-109.511 tagged_above=-999 required=6.31 tests=[ENV_AND_HDR_SPF_MATCH=-0.5, KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_MED=-2.3, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01, USER_IN_DEF_SPF_WL=-7.5, USER_IN_WHITELIST=-100] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id h9-BV_3hzQfJ for ; Thu, 1 Mar 2018 02:30:01 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id 470495F340 for ; Thu, 1 Mar 2018 02:30:01 +0000 (UTC) Received: from jira-lw-us.apache.org (unknown [207.244.88.139]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id B3B20E0292 for ; Thu, 1 Mar 2018 02:30:00 +0000 (UTC) Received: from jira-lw-us.apache.org (localhost [127.0.0.1]) by jira-lw-us.apache.org (ASF Mail Server at jira-lw-us.apache.org) with ESMTP id 65BBD2475C for ; Thu, 1 Mar 2018 02:30:00 +0000 (UTC) Date: Thu, 1 Mar 2018 02:30:00 +0000 (UTC) From: "ASF GitHub Bot (JIRA)" To: issues@kylin.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Commented] (KYLIN-3265) Add "jobSearchMode" as a condition to "/kylin/api/jobs" API MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/KYLIN-3265?page=3Dcom.atlassian= .jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=3D1638= 1410#comment-16381410 ]=20 ASF GitHub Bot commented on KYLIN-3265: --------------------------------------- chenzhx closed pull request #109: KYLIN-3265 Add jobSearchMode as a filter = condition for jobs UI part URL: https://github.com/apache/kylin/pull/109 =20 =20 =20 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/webapp/app/js/controllers/job.js b/webapp/app/js/controllers/j= ob.js index 51de7874e0..130f14dffc 100644 --- a/webapp/app/js/controllers/job.js +++ b/webapp/app/js/controllers/job.js @@ -28,6 +28,7 @@ KylinApp //$scope.projects =3D []; $scope.action =3D {}; $scope.timeFilter =3D jobConfig.timeFilter[JobList.jobFilter.timeF= ilterId]; + $scope.searchMode =3D jobConfig.searchMode[JobList.jobFilter.searc= hModeId]; if ($routeParams.jobTimeFilter) { $scope.timeFilter =3D jobConfig.timeFilter[$routeParams.jobTim= eFilter]; } @@ -82,6 +83,7 @@ KylinApp $scope.cubeName=3D$scope.cubeName =3D=3D ""?null:$scope.cubeNa= me; JobList.jobFilter.cubeName =3D $scope.cubeName; JobList.jobFilter.timeFilterId =3D $scope.timeFilter.value; + JobList.jobFilter.searchModeId =3D _.indexOf(jobConfig.searchM= ode, $scope.searchMode); JobList.jobFilter.statusIds =3D statusIds; =20 var jobRequest =3D { @@ -90,7 +92,8 @@ KylinApp status: statusIds, offset: offset, limit: limit, - timeFilter: $scope.timeFilter.value + timeFilter: $scope.timeFilter.value, + jobSearchMode: $scope.searchMode.value }; $scope.state.loading =3D true; =20 diff --git a/webapp/app/js/model/jobConfig.js b/webapp/app/js/model/jobConf= ig.js index 4548366579..19ae882c98 100644 --- a/webapp/app/js/model/jobConfig.js +++ b/webapp/app/js/model/jobConfig.js @@ -40,6 +40,11 @@ KylinApp.constant('jobConfig', { {attr: 'last_modified', name: 'Last Modified Time'}, {attr: 'duration', name: 'Duration'} ], + searchMode: [ + {name: 'CUBING', value: 'CUBING_ONLY'}, + {name: 'CHECK POINT', value: 'CHECKPOINT_ONLY'}, + {name: 'ALL', value: 'ALL'} + ], queryitems: [ {attr: 'server', name: 'Server'}, {attr: 'user', name: 'User'}, diff --git a/webapp/app/js/model/jobListModel.js b/webapp/app/js/model/jobL= istModel.js index 45948d63e3..197532c076 100755 --- a/webapp/app/js/model/jobListModel.js +++ b/webapp/app/js/model/jobListModel.js @@ -26,6 +26,7 @@ KylinApp.service('JobList',function(JobService,$q){ this.jobFilter =3D { cubeName : null, timeFilterId : 1, + searchModeId: 2, statusIds: [] }; =20 @@ -33,6 +34,7 @@ KylinApp.service('JobList',function(JobService,$q){ this.jobFilter =3D { cubeName : null, timeFilterId : 1, + searchModeId: 2, statusIds: [] }; }; diff --git a/webapp/app/partials/jobs/jobList.html b/webapp/app/partials/jo= bs/jobList.html index 1ff6ea4f2f..ae05590669 100644 --- a/webapp/app/partials/jobs/jobList.html +++ b/webapp/app/partials/jobs/jobList.html @@ -45,6 +45,9 @@ +