Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/restrict query deletion #31

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Feature/restrict query deletion #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5fe4ba1
Deleted queries should now no longer be refreshed
Codlydodly Aug 12, 2014
3ccf749
Merge branch 'master' of github.com:hailocab/redash into feature/dele…
Codlydodly Aug 12, 2014
8a169e4
removed console.log
Codlydodly Aug 12, 2014
b747f29
commented out the delete button in /queries because it was making eve…
Codlydodly Aug 13, 2014
1f0b301
need to save to quit
Codlydodly Aug 15, 2014
1983167
can now delete queries from the delete query column - although you ca…
Codlydodly Aug 15, 2014
cf082dd
Will now no longer check wether a query is being used which makes it lag
Codlydodly Aug 15, 2014
c943cb5
Better delete and also formatted a lot of the code
Codlydodly Aug 18, 2014
6406961
Dashboard no longer displays incorrectly
Codlydodly Aug 18, 2014
1bee672
On the way to completing the feature
Codlydodly Aug 18, 2014
d3f7c03
Deleting from /queries is beginning to see if the query is being used…
Codlydodly Aug 18, 2014
851c6ac
Delete is completely working from within a query, and the skeleton fo…
Codlydodly Aug 19, 2014
8a5981f
Delete button no longer deletes queries that are in dashboards
Codlydodly Aug 26, 2014
f02437d
Changed the look of the delete button in /queries
Codlydodly Aug 26, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
381 changes: 191 additions & 190 deletions rd_ui/app/scripts/controllers/controllers.js
View file
Open in desktop

Large diffs are not rendered by default.

382 changes: 199 additions & 183 deletions rd_ui/app/scripts/controllers/query_view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,187 +1,203 @@
(function() {
'use strict';

function QueryViewCtrl($scope, Events, $route, $timeout, $location, notifications, growl, Query, DataSource, Widget, Dashboard) {
var DEFAULT_TAB = 'table';

$scope.query = $route.current.locals.query;
Events.record(currentUser, 'view', 'query', $scope.query.id);
$scope.queryResult = $scope.query.getQueryResult();
$scope.queryExecuting = false;
$scope.queryUsed = $scope.query.queryWidget();

$scope.isQueryOwner = currentUser.id === $scope.query.user.id;
$scope.canViewSource = currentUser.hasPermission('view_source');

$scope.dataSources = DataSource.get(function(dataSources) {
$scope.query.data_source_id = $scope.query.data_source_id || dataSources[0].id;
});

$scope.lockButton = function(lock) {
$scope.queryExecuting = lock;
};

$scope.saveQuery = function(options, data) {
if (data) {
data.id = $scope.query.id;
} else {
data = $scope.query;
}

options = _.extend({}, {
successMessage: 'Query saved',
errorMessage: 'Query could not be saved'
}, options);

delete $scope.query.latest_query_data;
delete $scope.query.queryResult;

return Query.save(data, function() {
growl.addSuccessMessage(options.successMessage);
}, function(httpResponse) {
growl.addErrorMessage(options.errorMessage);
}).$promise;
}

$scope.saveDescription = function() {
Events.record(currentUser, 'edit_description', 'query', $scope.query.id);
$scope.saveQuery(undefined, {'description': $scope.query.description});
};

$scope.saveName = function() {
Events.record(currentUser, 'edit_name', 'query', $scope.query.id);
$scope.saveQuery(undefined, {'name': $scope.query.name});
};

$scope.executeQuery = function() {
if ($scope.query.is_archived == false) {
$scope.queryResult = $scope.query.getQueryResult(0);
$scope.lockButton(true);
$scope.cancelling = false;
Events.record(currentUser, 'execute', 'query', $scope.query.id);
}
};


$scope.goToBottom = function () {
window.scrollTo(0,9999999999999999);
}

$scope.cancelExecution = function() {
$scope.cancelling = true;
$scope.queryResult.cancelExecution();
Events.record(currentUser, 'cancel_execute', 'query', $scope.query.id);
};

$scope.deleteQuery = function () {


var options = {
successMessage: 'Query deleted',
errorMessage: 'Query could not be deleted',
errorQueryUsed: 'This query is used in a dashboard'
};

if ($scope.queryUsed.widget == null) {
var dashboards = $scope.dashboards
Events.record(currentUser, "archive", "query", $scope.query.id);
return $scope.query.$delete;
} else {
growl.addErrorMessage(options.errorQueryUsed);
}
}

$scope.redirect = function() {
return $location.path('/queries');
}

$scope.updateDataSource = function() {
Events.record(currentUser, 'update_data_source', 'query', $scope.query.id);
$scope.query.latest_query_data = null;
$scope.query.latest_query_data_id = null;
Query.save({
'id': $scope.query.id,
'data_source_id': $scope.query.data_source_id,
'latest_query_data_id': null
});

$scope.executeQuery();
};

$scope.setVisualizationTab = function (visualization) {
$scope.selectedTab = visualization.id;
$location.hash(visualization.id);
'use strict';

function QueryViewCtrl($scope, Events, $route, $timeout, $location, notifications, growl, Query, DataSource, Widget, Dashboard) {
var DEFAULT_TAB = 'table';

$scope.query = $route.current.locals.query;
Events.record(currentUser, 'view', 'query', $scope.query.id);
$scope.queryResult = $scope.query.getQueryResult();
$scope.queryExecuting = false;

$scope.isQueryOwner = currentUser.id === $scope.query.user.id;
$scope.canViewSource = currentUser.hasPermission('view_source');

$scope.dataSources = DataSource.get(function(dataSources) {
$scope.query.data_source_id = $scope.query.data_source_id || dataSources[0].id;
});

$scope.lockButton = function(lock) {
$scope.queryExecuting = lock;
};

$scope.saveQuery = function(options, data) {
if (data) {
data.id = $scope.query.id;
} else {
data = $scope.query;
}

options = _.extend({}, {
successMessage: 'Query saved',
errorMessage: 'Query could not be saved'
}, options);

delete $scope.query.latest_query_data;
delete $scope.query.queryResult;

return Query.save(data, function() {
growl.addSuccessMessage(options.successMessage);
}, function(httpResponse) {
growl.addErrorMessage(options.errorMessage);
}).$promise;
}

$scope.saveDescription = function() {
Events.record(currentUser, 'edit_description', 'query', $scope.query.id);
$scope.saveQuery(undefined, {
'description': $scope.query.description
});
};

$scope.saveName = function() {
Events.record(currentUser, 'edit_name', 'query', $scope.query.id);
$scope.saveQuery(undefined, {
'name': $scope.query.name
});
};

$scope.executeQuery = function() {
if ($scope.query.is_archived == false) {
$scope.queryResult = $scope.query.getQueryResult(0);
$scope.lockButton(true);
$scope.cancelling = false;
Events.record(currentUser, 'execute', 'query', $scope.query.id);
}
};


$scope.goToBottom = function() {
window.scrollTo(0, 9999999999999999);
}

$scope.cancelExecution = function() {
$scope.cancelling = true;
$scope.queryResult.cancelExecution();
Events.record(currentUser, 'cancel_execute', 'query', $scope.query.id);
};

$scope.setUpDelete = function() {
$scope.queryUsed = $scope.query.queryWidget();
}

$scope.deleteQuery = function(data) {
if (data) {
data.id = $scope.query.id;
} else {
data = $scope.query;
}

var options = {
successMessage: 'Query deleted',
errorMessage: 'Query could not be deleted',
errorQueryUsed: 'This query is used in a dashboard'
};
if ($scope.queryUsed.widget != null) {
growl.addErrorMessage(options.errorQueryUsed)
} else {
Events.record(currentUser, "archive", "query", $scope.query.id);
Query.delete(data, function() {
growl.addSuccessMessage(options.successMessage);
$location.path('/queries');
}, function(httpResponse) {
growl.addErrorMessage(options.errorMessage);
}).$promise;

}
}



$scope.redirect = function() {
return $location.path('/queries');
}

$scope.updateDataSource = function() {
Events.record(currentUser, 'update_data_source', 'query', $scope.query.id);
$scope.query.latest_query_data = null;
$scope.query.latest_query_data_id = null;
Query.save({
'id': $scope.query.id,
'data_source_id': $scope.query.data_source_id,
'latest_query_data_id': null
});

$scope.executeQuery();
};

$scope.setVisualizationTab = function(visualization) {
$scope.selectedTab = visualization.id;
$location.hash(visualization.id);
};

$scope.$watch('query.name', function() {
$scope.$parent.pageTitle = $scope.query.name;
});

$scope.$watch('queryResult && queryResult.getError()', function(newError, oldError) {
if (newError == undefined) {
return;
}

if (oldError == undefined && newError != undefined) {
$scope.lockButton(false);
}
});

$scope.$watch('queryResult && queryResult.getData()', function(data, oldData) {
if (!data) {
return;
}

$scope.filters = $scope.queryResult.getFilters();

if ($scope.queryResult.getId() == null) {
$scope.dataUri = "";
} else {
$scope.dataUri =
'/api/queries/' + $scope.query.id + '/results/' +
$scope.queryResult.getId() + '.csv';

$scope.dataFilename =
$scope.query.name.replace(" ", "_") +
moment($scope.queryResult.getUpdatedAt()).format("_YYYY_MM_DD") +
".csv";
}
});

$scope.$watch("queryResult && queryResult.getStatus()", function(status) {
if (!status) {
return;
}

if (status == "done") {
if ($scope.query.id &&
$scope.query.latest_query_data_id != $scope.queryResult.getId() &&
$scope.query.query_hash == $scope.queryResult.query_result.query_hash) {
Query.save({
'id': $scope.query.id,
'latest_query_data_id': $scope.queryResult.getId()
})
}
$scope.query.latest_query_data_id = $scope.queryResult.getId();

notifications.showNotification("re:dash", $scope.query.name + " updated.");

$scope.lockButton(false);
}
});

$scope.$watch(function() {
return $location.hash()
}, function(hash) {
if (hash == 'pivot') {
Events.record(currentUser, 'pivot', 'query', $scope.query && $scope.query.id);
}

$scope.selectedTab = hash || DEFAULT_TAB;
});
};

$scope.$watch('query.name', function() {
$scope.$parent.pageTitle = $scope.query.name;
});

$scope.$watch('queryResult && queryResult.getError()', function(newError, oldError) {
if (newError == undefined) {
return;
}

if (oldError == undefined && newError != undefined) {
$scope.lockButton(false);
}
});

$scope.$watch('queryResult && queryResult.getData()', function(data, oldData) {
if (!data) {
return;
}

$scope.filters = $scope.queryResult.getFilters();

if ($scope.queryResult.getId() == null) {
$scope.dataUri = "";
} else {
$scope.dataUri =
'/api/queries/' + $scope.query.id + '/results/' +
$scope.queryResult.getId() + '.csv';

$scope.dataFilename =
$scope.query.name.replace(" ", "_") +
moment($scope.queryResult.getUpdatedAt()).format("_YYYY_MM_DD") +
".csv";
}
});

$scope.$watch("queryResult && queryResult.getStatus()", function(status) {
if (!status) {
return;
}

if (status == "done") {
if ($scope.query.id &&
$scope.query.latest_query_data_id != $scope.queryResult.getId() &&
$scope.query.query_hash == $scope.queryResult.query_result.query_hash) {
Query.save({
'id': $scope.query.id,
'latest_query_data_id': $scope.queryResult.getId()
})
}
$scope.query.latest_query_data_id = $scope.queryResult.getId();

notifications.showNotification("re:dash", $scope.query.name + " updated.");

$scope.lockButton(false);
}
});

$scope.$watch(function() {
return $location.hash()
}, function(hash) {
if (hash == 'pivot') {
Events.record(currentUser, 'pivot', 'query', $scope.query && $scope.query.id);
}

$scope.selectedTab = hash || DEFAULT_TAB;
});
};

angular.module('redash.controllers')
.controller('QueryViewCtrl',
['$scope', 'Events', '$route', '$timeout', '$location', 'notifications', 'growl', 'Query', 'DataSource', 'Widget', 'Dashboard', QueryViewCtrl]);
angular.module('redash.controllers')
.controller('QueryViewCtrl', ['$scope', 'Events', '$route', '$timeout', '$location', 'notifications', 'growl', 'Query', 'DataSource', 'Widget', 'Dashboard', QueryViewCtrl]);
})();
Loading