Merge 27da384 into c46d66f

CLOSER-Cohorts · Aug 19, 2019 · e6035f5 · e6035f5
2 parents c46d66f + 27da384
commit e6035f5
Show file tree

Hide file tree

Showing 181 changed files with 11,492 additions and 12,543 deletions.
diff --git a/README.md b/README.md
@@ -49,14 +49,5 @@ To run the test suite just call `rails test`. Currently 197 tests and 256 assert
   - Test LOC: 1196
   - Code to Test Ratio: 1:0.1
 
-## Archivist Realtime
-Archivist is both a module within Archivist and an entirely separate
-webapp. [Archivist-realtime][realtime] is very slim Node.js app that
-provides a communications channel between the [Redis][redis] cache and
-all active users via websockets (Socket.io). The purpose of this is to
-be able to lock objects while editing them and to update a users
-screen as changes are made to an instrument.
-
-[realtime]: https://github.com/CLOSER-Cohorts/archivist-realtime
 [redis]: https://redis.io
 [heroku]: https://heroku.com
diff --git a/app/assets/javascripts/application.coffee b/app/assets/javascripts/application.coffee
@@ -52,7 +52,6 @@ archivist = angular.module('archivist', [
   'archivist.summary',
   'archivist.topics',
   'archivist.admin',
-  'archivist.realtime',
   'archivist.users',
   'archivist.data_manager'
 ])
@@ -139,8 +138,8 @@ archivist.directive 'ngFileModel', [
     }
 ]
 
-archivist.run(['$rootScope', 'Flash', 'RealTimeConnection', 'bsLoadingOverlayService',
-  ($rootScope, Flash, RealTimeConnection, bsLoadingOverlayService)->
+archivist.run(['$rootScope', 'Flash', 'bsLoadingOverlayService',
+  ($rootScope, Flash, bsLoadingOverlayService)->
     bsLoadingOverlayService.setGlobalConfig {
       templateUrl: 'bsLoadingOverlaySpinJs',
       activeClass: 'loading'
@@ -237,8 +236,6 @@ archivist.run(['$rootScope', 'Flash', 'RealTimeConnection', 'bsLoadingOverlaySer
 
     $rootScope.page = {title: 'Home'}
 
-    $rootScope.realtimeStatus = false
-
     $rootScope.range = (i)->
       (num for num in [1..i])
 ])

diff --git a/app/assets/javascripts/lib/data_manager.coffee b/app/assets/javascripts/lib/data_manager.coffee
@@ -14,7 +14,6 @@ data_manager = angular.module(
     'archivist.data_manager.stats',
     'archivist.data_manager.topics',
     'archivist.data_manager.auth',
-    'archivist.realtime',
     'archivist.resource'
   ]
 )
@@ -31,7 +30,6 @@ data_manager.factory(
     'ResponseUnits',
     'ResponseDomains',
     'ResolutionService',
-    'RealTimeListener',
     'GetResource',
     'ApplicationStats',
     'Topics',
@@ -50,7 +48,6 @@ data_manager.factory(
       ResponseUnits,
       ResponseDomains,
       ResolutionService,
-      RealTimeListener,
       GetResource,
       ApplicationStats,
       Topics,
@@ -424,52 +421,6 @@ data_manager.factory(
           )
           DataManager.GroupResolver.resolve()
 
-      DataManager.listener = RealTimeListener (event, message)->
-        console.log "Rt update"
-        if message.data?
-          reresolve_constructs = false
-          reresolve_questions = false
-          for row in message.data
-            try
-              obj = Map.find(DataManager.Data, row.type).select_resource_by_id row.id
-              if obj?
-                if obj['type'] == 'question'
-                  old_q_id = obj['question_id']
-                  old_q_type = obj['question_type']
-                for key, value of row
-                  if ['id','type'].indexOf(key) == -1
-                    if ['children','fchildren'].indexOf(key) != -1
-                      old_children = obj['children']
-                      old_fchildren = obj['fchildren']
-                    obj[key] = row[key]
-                    if ['children','fchildren'].indexOf(key) != -1 && (old_children != obj['children'] || old_fchildren != obj['fchildren'])
-                      reresolve_constructs = true
-                if obj['type'] == 'question' && (old_q_id != obj['question_id'] || old_q_type != obj['question_type'])
-                  obj.base = null
-                  reresolve_questions = true
-              else if row.type != "Instrument" && row.action? && row.action == "ADD"
-                if row.instrument_id? && row.instrument_id == DataManager.Data.Instrument.id
-                  arr = Map.find(DataManager.Data, row.type)
-                  resource = Map.find(DataManager, row.type).resource
-                  obj = new resource({})
-                  console.log obj
-                  for key, value of row
-                    obj[key] = row[key]
-                  if ['CcLoop','CcCondition','CcQuestion','CcStatement','CcSequence'].indexOf(obj.type) != -1
-                    obj.type = Map.translate(obj.type)
-                  console.log obj
-                  arr.push obj
-
-            if row.type == 'Instrument' and row.id == DataManager.Data.Instrument.id
-              for key, value of row
-                if ['id','type'].indexOf(key) == -1
-                  DataManager.Data.Instrument[key] = row[key]
-
-          if reresolve_questions
-            DataManager.resolveQuestions()
-          if reresolve_constructs
-            DataManager.resolveConstructs()
-
       DataManager
   ]
 )
diff --git a/app/assets/javascripts/lib/realtime.coffee b/app/assets/javascripts/lib/realtime.coffee
diff --git a/app/assets/javascripts/sections/instruments/modules/build/controllers/base.coffee b/app/assets/javascripts/sections/instruments/modules/build/controllers/base.coffee
@@ -7,9 +7,7 @@ angular.module('archivist.build').controller(
     '$timeout',
     'Flash',
     'DataManager',
-    'RealTimeListener',
-    'RealTimeLocking',
-    ($scope, $routeParams, $location, $timeout, Flash, DataManager, RealTimeListener, RealTimeLocking)->
+    ($scope, $routeParams, $location, $timeout, Flash, DataManager)->
 
       $scope.page['title'] = $scope.title
       $scope.underscored = $scope.title.toLowerCase().replaceAll(' ','_')
@@ -73,16 +71,12 @@ angular.module('archivist.build').controller(
         $scope.startEditMode = () ->
           $scope.editMode = true
           console.log $scope.current
-          RealTimeLocking.lock({type: $scope.current.type, id: $scope.current.id})
           null
 
       if !$scope.change_panel?
         $scope.change_panel = (obj) ->
           localStorage.setItem 'sidebar_scroll', jQuery('.sidebar').scrollTop()
           $location.url $scope.edit_path obj
 
-      $scope.listener = RealTimeListener (event, message)->
-        if !$scope.editMode
-          $scope.reset()
   ]
-)
+)
diff --git a/app/assets/javascripts/sections/instruments/modules/build/controllers/code_lists.coffee b/app/assets/javascripts/sections/instruments/modules/build/controllers/code_lists.coffee
@@ -9,9 +9,7 @@ angular.module('archivist.build').controller(
     '$timeout'
     'Flash',
     'DataManager',
-    'RealTimeListener',
-    'RealTimeLocking',
-    ($controller, $scope, $routeParams, $location, $filter, $timeout, Flash, DataManager, RealTimeListener, RealTimeLocking)->
+    ($controller, $scope, $routeParams, $location, $filter, $timeout, Flash, DataManager)->
 
       console.log 'called code_list controller'
 
@@ -92,8 +90,6 @@ angular.module('archivist.build').controller(
         if not isNaN($routeParams.code_list_id)
           $scope.current = angular.copy $scope.instrument.CodeLists.select_resource_by_id parseInt $routeParams.code_list_id
           $scope.editMode = false
-          if $scope.current?
-            RealTimeLocking.unlock({type: $scope.current.type, id: $scope.current.id})
         if $routeParams.code_list_id == 'new'
           $scope.editMode = true
           $scope.current = new DataManager.Codes.CodeLists.resource({codes: []});
@@ -154,9 +150,7 @@ angular.module('archivist.build').controller(
           $routeParams: $routeParams,
           $location: $location,
           Flash: Flash,
-          DataManager: DataManager,
-          RealTimeListener: RealTimeListener,
-          RealTimeLocking: RealTimeLocking
+          DataManager: DataManager
         }
       )
   ]

diff --git a/app/assets/javascripts/sections/instruments/modules/build/controllers/constructs.coffee b/app/assets/javascripts/sections/instruments/modules/build/controllers/constructs.coffee
@@ -11,9 +11,7 @@ angular.module('archivist.build').controller(
     'bsLoadingOverlayService',
     'Flash',
     'DataManager',
-    'RealTimeListener',
-    'RealTimeLocking',
-    ($controller, $scope, $routeParams, $location, $filter, $http, $timeout, bsLoadingOverlayService, Flash, DataManager, RealTimeListener, RealTimeLocking )->
+    ($controller, $scope, $routeParams, $location, $filter, $http, $timeout, bsLoadingOverlayService, Flash, DataManager )->
       console.time 'end to end'
       $scope.title = 'Constructs'
       $scope.details_bar = true
@@ -244,9 +242,7 @@ angular.module('archivist.build').controller(
           $routeParams: $routeParams,
           $location: $location,
           Flash: Flash,
-          DataManager: DataManager,
-          RealTimeListener: RealTimeListener,
-          RealTimeLocking: RealTimeLocking
+          DataManager: DataManager
         }
       )
       console.timeEnd 'load base'

diff --git a/app/assets/javascripts/sections/instruments/modules/build/controllers/questions.coffee b/app/assets/javascripts/sections/instruments/modules/build/controllers/questions.coffee
@@ -7,19 +7,15 @@ angular.module('archivist.build').controller(
     '$location',
     '$timeout',
     'Flash',
-    'DataManager',
-    'RealTimeListener',
-    'RealTimeLocking',
+    'DataManager'
     (
       $controller,
       $scope,
       $routeParams,
       $location,
       $timeout
       Flash,
-      DataManager,
-      RealTimeListener,
-      RealTimeLocking
+      DataManager
     ) ->
 
       $scope.load_sidebar = ->
@@ -121,8 +117,6 @@ angular.module('archivist.build').controller(
             $scope.current = angular.copy $scope.instrument.Questions.Grids.select_resource_by_id parseInt $routeParams.question_id
             $scope.title = 'Question Grid'
           $scope.editMode = false
-          if $scope.current?
-            RealTimeLocking.unlock({type: $scope.current.type, id: $scope.current.id})
 
 
 
@@ -161,10 +155,8 @@ angular.module('archivist.build').controller(
           $location: $location,
           $timeout: $timeout,
           Flash: Flash,
-          DataManager: DataManager,
-          RealTimeListener: RealTimeListener,
-          RealTimeLocking: RealTimeLocking
+          DataManager: DataManager
         }
       )
   ]
-)
+)
diff --git a/...assets/javascripts/sections/instruments/modules/build/controllers/response_domains.coffee b/...assets/javascripts/sections/instruments/modules/build/controllers/response_domains.coffee
@@ -10,9 +10,7 @@ angular.module('archivist.build').controller(
     'Flash',
     'DataManager',
     'Map',
-    'RealTimeListener',
-    'RealTimeLocking',
-    ($controller, $scope, $routeParams, $location, $filter, $timeout, Flash, DataManager, Map, RealTimeListener, RealTimeLocking)->
+    ($controller, $scope, $routeParams, $location, $filter, $timeout, Flash, DataManager, Map)->
 
       $scope.load_sidebar = ->
         $scope.sidebar_objs = $filter('excludeRDC')($scope.instrument.ResponseDomains).sort_by_property()
@@ -94,8 +92,6 @@ angular.module('archivist.build').controller(
 
               $scope.current = angular.copy rd
               $scope.editMode = false
-              if $scope.current?
-                RealTimeLocking.unlock({type: $scope.current.type, id: $scope.current.id})
               break
         if $routeParams.response_domain_type == 'new'
           $scope.editMode = true
@@ -121,10 +117,8 @@ angular.module('archivist.build').controller(
           $location: $location,
           $timeout: $timeout,
           Flash: Flash,
-          DataManager: DataManager,
-          RealTimeListener: RealTimeListener,
-          RealTimeLocking: RealTimeLocking
+          DataManager: DataManager
         }
       )
   ]
-)
+)
diff --git a/app/assets/javascripts/sections/instruments/modules/build/index.coffee b/app/assets/javascripts/sections/instruments/modules/build/index.coffee
@@ -5,8 +5,7 @@ build = angular.module('archivist.build', [
   'templates',
   'ngRoute',
   'archivist.flash',
-  'archivist.data_manager',
-  'archivist.realtime'
+  'archivist.data_manager'
 ])
 
 build.config(['$routeProvider', 'treeConfig'
@@ -36,4 +35,4 @@ build.config(['$routeProvider', 'treeConfig'
     treeConfig.placeholderClass = 'a-tree-placeholder a-construct list-group-item'
     treeConfig.hiddenClass = 'a-tree-hidden'
     treeConfig.dragClass = 'a-tree-drag'
-])
+])