Skip to content
Snippets Groups Projects
Commit aadb6ac3 authored by Cam Saül's avatar Cam Saül
Browse files

Merge pull request #401 from metabase/code_cleanup_3000

remove some stray trailing commas in metabase.services.js :cry:
parents dac4846b 97aaa757
Branches
Tags
No related merge requests found
......@@ -6,189 +6,294 @@ var MetabaseServices = angular.module('corvus.metabase.services', ['ngResource',
MetabaseServices.factory('Metabase', ['$resource', '$cookies', function($resource, $cookies) {
return $resource('/api/meta', {}, {
db_form_input: {
url:'/api/meta/db/form_input',
method:'GET'
url: '/api/meta/db/form_input',
method: 'GET'
},
db_list: {
url:'/api/meta/db/?org=:orgId',
method:'GET',
isArray:true
url: '/api/meta/db/?org=:orgId',
method: 'GET',
isArray: true
},
db_create: {
url:'/api/meta/db/',
method:'POST',
headers: {'X-CSRFToken': function() { return $cookies.csrftoken; }}
url: '/api/meta/db/',
method: 'POST',
headers: {
'X-CSRFToken': function() {
return $cookies.csrftoken;
}
}
},
validate_connection: {
url:'/api/meta/db/validate/',
method:'POST',
headers: {'X-CSRFToken': function() { return $cookies.csrftoken; }},
url: '/api/meta/db/validate/',
method: 'POST',
headers: {
'X-CSRFToken': function() {
return $cookies.csrftoken;
}
},
transformRequest: function(data) {
// API expects 'port' to be an int :imp:
if (data.port) data.port = parseInt(data.port);
return angular.toJson(data);
// API expects 'port' to be an int :imp:
if (data.port) data.port = parseInt(data.port);
return angular.toJson(data);
}
},
db_get: {
url:'/api/meta/db/:dbId',
method:'GET',
params:{dbId:'@dbId'}
url: '/api/meta/db/:dbId',
method: 'GET',
params: {
dbId: '@dbId'
}
},
db_update: {
url:'/api/meta/db/:dbId',
method:'PUT',
params:{dbId:'@id'},
headers: {'X-CSRFToken': function() { return $cookies.csrftoken; }}
url: '/api/meta/db/:dbId',
method: 'PUT',
params: {
dbId: '@id'
},
headers: {
'X-CSRFToken': function() {
return $cookies.csrftoken;
}
}
},
db_delete: {
url:'/api/meta/db/:dbId',
method:'DELETE',
params:{dbId:'@dbId'},
headers: {'X-CSRFToken': function() { return $cookies.csrftoken; }},
url: '/api/meta/db/:dbId',
method: 'DELETE',
params: {
dbId: '@dbId'
},
headers: {
'X-CSRFToken': function() {
return $cookies.csrftoken;
}
}
},
db_tables: {
url:'/api/meta/db/:dbId/tables',
method:'GET',
params:{dbId:'@dbId'},
isArray:true
url: '/api/meta/db/:dbId/tables',
method: 'GET',
params: {
dbId: '@dbId'
},
isArray: true
},
db_idfields: {
url:'/api/meta/db/:dbId/idfields',
method:'GET',
params:{dbId:'@dbId'},
isArray:true
url: '/api/meta/db/:dbId/idfields',
method: 'GET',
params: {
dbId: '@dbId'
},
isArray: true
},
db_autocomplete_suggestions: {
url:'/api/meta/db/:dbId/autocomplete_suggestions?prefix=:prefix',
method:'GET',
params:{dbId:'@dbId'},
isArray:true
url: '/api/meta/db/:dbId/autocomplete_suggestions?prefix=:prefix',
method: 'GET',
params: {
dbId: '@dbId'
},
isArray: true
},
db_sync_metadata: {
url:'/api/meta/db/:dbId/sync',
method:'POST',
params:{dbId:'@dbId'},
headers: {'X-CSRFToken': function() { return $cookies.csrftoken; }}
url: '/api/meta/db/:dbId/sync',
method: 'POST',
params: {
dbId: '@dbId'
},
headers: {
'X-CSRFToken': function() {
return $cookies.csrftoken;
}
}
},
table_list: {
url:'/api/meta/table/',
method:'GET',
params:{tableId:'@tableId'},
isArray:true
url: '/api/meta/table/',
method: 'GET',
params: {
tableId: '@tableId'
},
isArray: true
},
table_get: {
url:'/api/meta/table/:tableId',
method:'GET',
params:{tableId:'@tableId'}
url: '/api/meta/table/:tableId',
method: 'GET',
params: {
tableId: '@tableId'
}
},
table_update: {
url:'/api/meta/table/:tableId',
method:'PUT',
params:{tableId:'@id'},
headers: {'X-CSRFToken': function() { return $cookies.csrftoken; }}
url: '/api/meta/table/:tableId',
method: 'PUT',
params: {
tableId: '@id'
},
headers: {
'X-CSRFToken': function() {
return $cookies.csrftoken;
}
}
},
table_fields: {
url:'/api/meta/table/:tableId/fields',
method:'GET',
params:{tableId:'@tableId'},
isArray:true
url: '/api/meta/table/:tableId/fields',
method: 'GET',
params: {
tableId: '@tableId'
},
isArray: true
},
table_fks: {
url:'/api/meta/table/:tableId/fks',
method:'GET',
params:{tableId:'@tableId'},
isArray:true
url: '/api/meta/table/:tableId/fks',
method: 'GET',
params: {
tableId: '@tableId'
},
isArray: true
},
table_reorder_fields: {
url:'/api/meta/table/:tableId/reorder',
method:'POST',
params:{tableId:'@tableId'},
headers: {'X-CSRFToken': function() { return $cookies.csrftoken; }},
url: '/api/meta/table/:tableId/reorder',
method: 'POST',
params: {
tableId: '@tableId'
},
headers: {
'X-CSRFToken': function() {
return $cookies.csrftoken;
}
},
},
table_segments: {
url:'/api/meta/table/:tableId/segments',
method:'GET',
params:{tableId:'@tableId'},
isArray:true
url: '/api/meta/table/:tableId/segments',
method: 'GET',
params: {
tableId: '@tableId'
},
isArray: true
},
table_createsegment: {
url:'/api/meta/table/:tableId/segments',
method:'POST',
params:{tableId:'@tableId'},
headers: {'X-CSRFToken': function() { return $cookies.csrftoken; }}
url: '/api/meta/table/:tableId/segments',
method: 'POST',
params: {
tableId: '@tableId'
},
headers: {
'X-CSRFToken': function() {
return $cookies.csrftoken;
}
}
},
table_dependents: {
url:'/api/dependency/table/:tableId/dependents',
method:'GET',
params:{tableId:'@tableId'}
url: '/api/dependency/table/:tableId/dependents',
method: 'GET',
params: {
tableId: '@tableId'
}
},
table_query_metadata: {
url:'/api/meta/table/:tableId/query_metadata',
method:'GET',
params:{dbId:'@tableId'},
url: '/api/meta/table/:tableId/query_metadata',
method: 'GET',
params: {
dbId: '@tableId'
}
},
table_sync_metadata: {
url:'/api/meta/table/:tableId/sync',
method:'POST',
params:{tableId:'@tableId'},
headers: {'X-CSRFToken': function() { return $cookies.csrftoken; }}
url: '/api/meta/table/:tableId/sync',
method: 'POST',
params: {
tableId: '@tableId'
},
headers: {
'X-CSRFToken': function() {
return $cookies.csrftoken;
}
}
},
field_get: {
url:'/api/meta/field/:fieldId',
method:'GET',
params:{fieldId:'@fieldId'}
url: '/api/meta/field/:fieldId',
method: 'GET',
params: {
fieldId: '@fieldId'
}
},
field_summary: {
url:'/api/meta/field/:fieldId/summary',
method:'GET',
params:{fieldId:'@fieldId'},
isArray:true
url: '/api/meta/field/:fieldId/summary',
method: 'GET',
params: {
fieldId: '@fieldId'
},
isArray: true
},
field_values: {
url:'/api/meta/field/:fieldId/values',
method:'GET',
params:{fieldId:'@fieldId'},
url: '/api/meta/field/:fieldId/values',
method: 'GET',
params: {
fieldId: '@fieldId'
}
},
field_value_map_update: {
url:'/api/meta/field/:fieldId/value_map_update',
method:'POST',
params:{fieldId:'@fieldId'},
headers: {'X-CSRFToken': function() { return $cookies.csrftoken; }}
url: '/api/meta/field/:fieldId/value_map_update',
method: 'POST',
params: {
fieldId: '@fieldId'
},
headers: {
'X-CSRFToken': function() {
return $cookies.csrftoken;
}
}
},
field_update: {
url:'/api/meta/field/:fieldId',
method:'PUT',
params:{fieldId:'@id'},
headers: {'X-CSRFToken': function() { return $cookies.csrftoken; }}
url: '/api/meta/field/:fieldId',
method: 'PUT',
params: {
fieldId: '@id'
},
headers: {
'X-CSRFToken': function() {
return $cookies.csrftoken;
}
}
},
field_pivots: {
url:'/api/meta/field/:fieldId/pivots',
method:'GET',
params:{fieldId:'@fieldId'},
isArray:true
url: '/api/meta/field/:fieldId/pivots',
method: 'GET',
params: {
fieldId: '@fieldId'
},
isArray: true
},
field_foreignkeys: {
url:'/api/meta/field/:fieldId/foreignkeys',
method:'GET',
params:{fieldId:'@fieldId'},
isArray:true
url: '/api/meta/field/:fieldId/foreignkeys',
method: 'GET',
params: {
fieldId: '@fieldId'
},
isArray: true
},
field_addfk: {
url:'/api/meta/field/:fieldId/foreignkeys',
method:'POST',
params:{fieldId:'@fieldId'},
headers: {'X-CSRFToken': function() { return $cookies.csrftoken; }}
url: '/api/meta/field/:fieldId/foreignkeys',
method: 'POST',
params: {
fieldId: '@fieldId'
},
headers: {
'X-CSRFToken': function() {
return $cookies.csrftoken;
}
}
},
metadata: {
url:'/api/meta/db/:dbId/metadata',
method:'GET',
params:{dbId:'@dbId'},
url: '/api/meta/db/:dbId/metadata',
method: 'GET',
params: {
dbId: '@dbId'
}
},
dataset: {
url:'/api/meta/dataset',
method:'POST',
headers: {'X-CSRFToken': function() { return $cookies.csrftoken; }}
url: '/api/meta/dataset',
method: 'POST',
headers: {
'X-CSRFToken': function() {
return $cookies.csrftoken;
}
}
}
});
}]);
......@@ -198,9 +303,15 @@ MetabaseServices.factory('Metabase', ['$resource', '$cookies', function($resourc
MetabaseServices.factory('ForeignKey', ['$resource', '$cookies', function($resource, $cookies) {
return $resource('/api/meta/fk/:fkID', {}, {
delete: {
method:'DELETE',
params:{fkID:'@fkID'},
headers: {'X-CSRFToken': function() { return $cookies.csrftoken; }},
method: 'DELETE',
params: {
fkID: '@fkID'
},
headers: {
'X-CSRFToken': function() {
return $cookies.csrftoken;
}
},
},
});
......@@ -209,10 +320,16 @@ MetabaseServices.factory('ForeignKey', ['$resource', '$cookies', function($resou
MetabaseServices.factory('TableSegment', ['$resource', '$cookies', function($resource, $cookies) {
return $resource('/api/meta/segment/:segmentID', {}, {
delete: {
method:'DELETE',
params:{segmentID:'@segmentID'},
headers: {'X-CSRFToken': function() { return $cookies.csrftoken; }},
method: 'DELETE',
params: {
segmentID: '@segmentID'
},
headers: {
'X-CSRFToken': function() {
return $cookies.csrftoken;
}
},
},
});
}]);
}]);
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment