From 281ec60085ef1d659360a03083ea7d95cb4893b3 Mon Sep 17 00:00:00 2001 From: utkarshcmu Date: Tue, 19 Jan 2016 21:52:13 -0800 Subject: [PATCH] UI and backend working --- pkg/api/dashboard_snapshot.go | 1 - .../features/snapshot/partials/snapshots.html | 6 +-- public/app/features/snapshot/snapshot_ctrl.ts | 37 +++++++++++++++---- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/pkg/api/dashboard_snapshot.go b/pkg/api/dashboard_snapshot.go index 2d1fbce782c..99c8d4dd85f 100644 --- a/pkg/api/dashboard_snapshot.go +++ b/pkg/api/dashboard_snapshot.go @@ -36,7 +36,6 @@ func CreateDashboardSnapshot(c *middleware.Context, cmd m.CreateDashboardSnapsho cmd.DeleteKey = util.GetRandomString(32) cmd.OrgId = c.OrgId cmd.UserId = c.UserId - cmd.Name = c.Name metrics.M_Api_Dashboard_Snapshot_Create.Inc(1) } diff --git a/public/app/features/snapshot/partials/snapshots.html b/public/app/features/snapshot/partials/snapshots.html index 9d1b688fd35..58b6c872617 100644 --- a/public/app/features/snapshot/partials/snapshots.html +++ b/public/app/features/snapshot/partials/snapshots.html @@ -1,7 +1,7 @@
-
+

Available snapshots

@@ -14,7 +14,7 @@ - + {{snapshot.Name}} @@ -28,7 +28,7 @@ - + diff --git a/public/app/features/snapshot/snapshot_ctrl.ts b/public/app/features/snapshot/snapshot_ctrl.ts index b194fbf9119..60b09bf892e 100644 --- a/public/app/features/snapshot/snapshot_ctrl.ts +++ b/public/app/features/snapshot/snapshot_ctrl.ts @@ -4,16 +4,39 @@ import angular from 'angular'; import _ from 'lodash'; export class SnapshotsCtrl { - snapshots: any[]; /** @ngInject */ - constructor(private backendSrv: any) {} + constructor(backendSrv, $scope) { + $scope.init = function() { + backendSrv.get('/api/dashboard/snapshots').then(function(result) { + $scope.snapshots = result; + }); + }; - init() { - this.backendSrv.get('/api/dashboard/snapshots').then(snapshots => { - this.snapshots = snapshots; - }); - console.log(this.snapshots); + $scope.removeSnapshot = function(snapshot) { + $scope.appEvent('confirm-modal', { + title: 'Confirm delete snapshot', + text: 'Are you sure you want to delete snapshot ' + snapshot.Name + '?', + yesText: "Delete", + icon: "fa-warning", + onConfirm: function() { + $scope.removeSnapshotConfirmed(snapshot); + } + }); + }; + + $scope.removeSnapshotConfirmed = function(snapshot) { + _.remove($scope.snapshots, {Key: snapshot.Key}); + backendSrv.get('/api/snapshots-delete/' + snapshot.DeleteKey) + .then(function() { + $scope.appEvent('alert-success', ['Snapshot deleted', '']); + }, function() { + $scope.appEvent('alert-error', ['Unable to delete snapshot', '']); + $scope.snapshots.push(snapshot); + }); + }; + + $scope.init(); } }