Merge pull request #38 from lyft/revert-37-LYFT-27661-history-workflow

Revert "Add a history view and revert workflow"

confidant/models/service.py

@@ -19,15 +19,6 @@ class Meta:
     modified_date = UTCDateTimeAttribute(range_key=True)
 
 
-class DataTypeRevisionIndex(GlobalSecondaryIndex):
-    class Meta:
-        projection = AllProjection()
-        read_capacity_units = 10
-        write_capacity_units = 10
-    data_type = UnicodeAttribute(hash_key=True)
-    revision = NumberAttribute(range_key=True)
-
-
 class Service(Model):
     class Meta:
         table_name = app.config.get('DYNAMODB_TABLE')
@@ -37,7 +28,6 @@ class Meta:
     id = UnicodeAttribute(hash_key=True)
     data_type = UnicodeAttribute()
     data_type_date_index = DataTypeDateIndex()
-    data_type_revision_index = DataTypeRevisionIndex()
     revision = NumberAttribute()
     credentials = UnicodeSetAttribute()
     modified_date = UTCDateTimeAttribute(default=datetime.now)

confidant/public/index.html

@@ -42,9 +42,9 @@ <h1>Confidant</h1>
 
     <div class="container-fluid container-bottomborder" role="navigation" ng-controller="common.NavCtrl">
       <ul class="nav nav-pills">
-        <li role="presentation" ng-class="{ 'active': viewLocation == 'resources' }"><a href="#/resources">Resources <span class="icon-lock"></span></a></li>
-        <li role="presentation" ng-class="{ 'active': viewLocation == 'history' }"><a href="#/history">History <span class="icon-clock"></span></a></li>
-        <li role="presentation" ng-class="{ 'active': viewLocation == 'admin' }"><a href="#/admin">Admin <span class="icon-settings"></span></a></li>
+        <li role="presentation" ng-class="{ active: viewLocation == 'resources'}"><a href="#/resources">Resources <span class="icon-lock"></span></a></li>
+        <!--<li role="presentation" ng-class="{ active: viewLocation == 'history'}"><a href="#/history">History<span class="icon-scroll"></span></a></li>-->
+        <li role="presentation" ng-class="{ active: viewLocation == 'admin'}"><a href="#/admin">Admin <span class="icon-settings"></span></a></li>
       </ul>
     </div>
     <div ui-view="main" class="container-fluid container-body"></div>
@@ -96,13 +96,6 @@ <h1>Confidant</h1>
     <script src="/modules/common/services/services.js"></script>
     <script src="/modules/common/services/spin-on.js"></script>
     <script src="/modules/common/services/userinfo.js"></script>
-    <script src="/modules/history/controllers/CredentialHistoryCtrl.js"></script>
-    <script src="/modules/history/controllers/ResourceHistoryCtrl.js"></script>
-    <script src="/modules/history/controllers/ServiceHistoryCtrl.js"></script>
-    <script src="/modules/history/controllers/controllers.js"></script>
-    <script src="/modules/history/history.js"></script>
-    <script src="/modules/history/services/archive.js"></script>
-    <script src="/modules/history/services/services.js"></script>
     <script src="/modules/resources/controllers/CredentialDetailsCtrl.js"></script>
     <script src="/modules/resources/controllers/ResourceCtrl.js"></script>
     <script src="/modules/resources/controllers/ServiceDetailsCtrl.js"></script>

confidant/public/modules/common/constants.js

@@ -15,11 +15,9 @@
         SERVICE: 'v1/services/:id',
         SERVICES: 'v1/services',
         ARCHIVE_SERVICES: 'v1/archive/services',
-        ARCHIVE_SERVICE_REVISIONS: 'v1/archive/services/:id/:revision',
         CREDENTIAL: 'v1/credentials/:id',
         CREDENTIALS: 'v1/credentials',
         ARCHIVE_CREDENTIALS: 'v1/archive/credentials',
-        ARCHIVE_CREDENTIAL_REVISIONS: 'v1/archive/credentials/:id/:revision',
         PROFILES: 'v1/profiles'
     })
 

confidant/public/modules/common/controllers/NavCtrl.js

@@ -14,12 +14,6 @@
                     $scope.viewLocation = newViewLocation;
                 }
             });
-            $scope.getHistoryView = NavService.getHistoryView;
-            $scope.$watch('getHistoryView()', function(newHistoryView, oldHistoryView) {
-                if(newHistoryView !== oldHistoryView) {
-                    $scope.historyView = newHistoryView;
-                }
-            });
         }])
 
     ;

confidant/public/modules/common/services/NavService.js

@@ -8,22 +8,16 @@
         function($rootScope) {
             var _this = this;
             this.viewLocation = '';
-            this.historyView = '';
             $rootScope.$on('$stateChangeSuccess', function(evt, state) {
                 if(state.data) {
                     _this.viewLocation = state.data.viewLocation;
-                    _this.historyView = state.data.historyView;
                 }
             });
 
             this.getViewLocation = function() {
                 return _this.viewLocation;
             };
 
-            this.getHistoryView = function() {
-                return _this.historyView;
-            };
-
         }])
 
     ;