|
@@ -67,13 +67,19 @@ def jobs(request, interface=None):
|
|
|
request.POST.get('filters', '[]')) for key, value in list(_filter.items()) if value
|
|
request.POST.get('filters', '[]')) for key, value in list(_filter.items()) if value
|
|
|
])
|
|
])
|
|
|
|
|
|
|
|
|
|
+ if interface == 'queries-hive':
|
|
|
|
|
+ filters = json.loads(request.body)
|
|
|
|
|
+
|
|
|
jobs = get_api(request.user, interface, cluster=cluster).apps(filters)
|
|
jobs = get_api(request.user, interface, cluster=cluster).apps(filters)
|
|
|
|
|
|
|
|
response['apps'] = jobs['apps']
|
|
response['apps'] = jobs['apps']
|
|
|
response['total'] = jobs.get('total')
|
|
response['total'] = jobs.get('total')
|
|
|
response['status'] = 0
|
|
response['status'] = 0
|
|
|
|
|
|
|
|
- return JsonResponse(response)
|
|
|
|
|
|
|
+ if interface == 'queries-hive':
|
|
|
|
|
+ return JsonResponse(response['apps'])
|
|
|
|
|
+ else:
|
|
|
|
|
+ return JsonResponse(response)
|
|
|
|
|
|
|
|
|
|
|
|
|
@api_error_handler
|
|
@api_error_handler
|
|
@@ -82,7 +88,10 @@ def job(request, interface=None):
|
|
|
|
|
|
|
|
cluster = json.loads(request.POST.get('cluster', '{}'))
|
|
cluster = json.loads(request.POST.get('cluster', '{}'))
|
|
|
interface = interface or json.loads(request.POST.get('interface'))
|
|
interface = interface or json.loads(request.POST.get('interface'))
|
|
|
- app_id = json.loads(request.POST.get('app_id'))
|
|
|
|
|
|
|
+ if interface == 'queries-hive':
|
|
|
|
|
+ app_id = json.loads(request.body)['queryId']
|
|
|
|
|
+ else:
|
|
|
|
|
+ app_id = json.loads(request.POST.get('app_id'))
|
|
|
|
|
|
|
|
if interface == 'schedules':
|
|
if interface == 'schedules':
|
|
|
offset = json.loads(request.POST.get('pagination', '{"offset": 1}')).get('offset')
|
|
offset = json.loads(request.POST.get('pagination', '{"offset": 1}')).get('offset')
|
|
@@ -96,7 +105,10 @@ def job(request, interface=None):
|
|
|
response['app'] = response_app
|
|
response['app'] = response_app
|
|
|
response['status'] = 0
|
|
response['status'] = 0
|
|
|
|
|
|
|
|
- return JsonResponse(response)
|
|
|
|
|
|
|
+ if interface == 'queries-hive':
|
|
|
|
|
+ return JsonResponse(response['app'])
|
|
|
|
|
+ else:
|
|
|
|
|
+ return JsonResponse(response)
|
|
|
|
|
|
|
|
|
|
|
|
|
@api_error_handler
|
|
@api_error_handler
|