change MetadataManagerService to EditorService

geonetwork · Dec 19, 2013 · 1dd32ac · 1dd32ac
1 parent f70948d
commit 1dd32ac
Show file tree

Hide file tree

Showing 17 changed files with 81 additions and 79 deletions.
diff --git a/web-ui/src/main/resources/catalog/components/catalog/CatalogService.js b/web-ui/src/main/resources/catalog/components/catalog/CatalogService.js
@@ -88,9 +88,9 @@
   // for search apps for example)
   module.factory('gnBatchProcessing', [
     'gnHttp',
-    'gnMetadataManagerService',
+    'gnEditor',
     '$q',
-    function(gnHttp, gnMetadataManagerService, $q) {
+    function(gnHttp, gnEditor, $q) {
 
       var processing = true;
       var processReport = null;
@@ -105,10 +105,10 @@
          */
         runProcessMd: function(params) {
           angular.extend(params, {
-            id: gnMetadataManagerService.getCurrentEdit().metadataId
+            id: gnEditor.getCurrentEdit().metadataId
           });
           var defer = $q.defer();
-          gnMetadataManagerService.save()
+          gnEditor.save()
                 .then(function() {
                 gnHttp.callService('processMd', params).then(function(data) {
                   defer.resolve(data);

diff --git a/web-ui/src/main/resources/catalog/components/edit/batchprocessbutton/BatchProcessButton.js b/web-ui/src/main/resources/catalog/components/edit/batchprocessbutton/BatchProcessButton.js
@@ -10,9 +10,9 @@
    */
   module.directive('gnBatchProcessButton',
       ['$rootScope', '$timeout', '$http', '$parse',
-        'gnMetadataManagerService', 'gnBatchProcessing',
+        'gnBatchProcessing',
         function($rootScope, $timeout, $http, $parse,
-            gnMetadataManagerService, gnBatchProcessing) {
+       gnBatchProcessing) {
 
          return {
            restrict: 'A',

diff --git a/web-ui/src/main/resources/catalog/components/edit/crsselector/CRSSelector.js b/web-ui/src/main/resources/catalog/components/edit/crsselector/CRSSelector.js
@@ -9,9 +9,9 @@
    */
   module.directive('gnCrsSelector',
       ['$rootScope', '$timeout', '$http',
-        'gnMetadataManagerService', 'gnEditorXMLService',
+        'gnEditor', 'gnEditorXMLService',
         function($rootScope, $timeout, $http,
-            gnMetadataManagerService, gnEditorXMLService) {
+            gnEditor, gnEditorXMLService) {
 
          return {
            restrict: 'A',
@@ -29,11 +29,11 @@
            'crsselector.html',
            link: function(scope, element, attrs) {
              scope.snippet = null;
-             scope.snippetRef = gnMetadataManagerService.
+             scope.snippetRef = gnEditor.
              buildXMLFieldName(scope.elementRef, scope.elementName);
 
              scope.add = function() {
-               gnMetadataManagerService.add(scope.metadataId,
+               gnEditor.add(scope.metadataId,
                    scope.elementRef, scope.elementName, scope.domId, 'before');
                return false;
              };
@@ -58,7 +58,7 @@
 
                $timeout(function() {
                  // Save the metadata and refresh the form
-                 gnMetadataManagerService.save(scope.metadataId, true);
+                 gnEditor.save(scope.metadataId, true);
                });
 
                return false;

diff --git a/...c/main/resources/catalog/components/edit/directoryentryselector/DirectoryEntrySelector.js b/...c/main/resources/catalog/components/edit/directoryentryselector/DirectoryEntrySelector.js
@@ -17,10 +17,10 @@
    */
   module.directive('gnDirectoryEntrySelector',
       ['$rootScope', '$timeout', '$q', '$http',
-        'gnMetadataManagerService', 'gnSchemaManagerService',
+        'gnEditor', 'gnSchemaManagerService',
         'gnEditorXMLService', 'gnUrlUtils',
         function($rootScope, $timeout, $q, $http, 
-            gnMetadataManagerService, gnSchemaManagerService, 
+            gnEditor, gnSchemaManagerService, 
             gnEditorXMLService, gnUrlUtils) {
 
          return {
@@ -50,11 +50,11 @@
              };
 
              scope.snippet = null;
-             scope.snippetRef = gnMetadataManagerService.
+             scope.snippetRef = gnEditor.
              buildXMLFieldName(scope.elementRef, scope.elementName);
 
              scope.add = function() {
-               gnMetadataManagerService.add(scope.metadataId,
+               gnEditor.add(scope.metadataId,
                    scope.elementRef, scope.elementName,
                    scope.domId, 'before');
                return false;
@@ -81,7 +81,7 @@
 
                     $timeout(function() {
                       // Save the metadata and refresh the form
-                      gnMetadataManagerService.save(scope.metadataId, true);
+                      gnEditor.save(scope.metadataId, true);
                     });
                  }
                };
@@ -129,10 +129,8 @@
        }]);
 
   module.directive('gnDirectoryEntryMultiSelector',
-      ['$rootScope', '$timeout',
-        'gnMetadataManagerService',
-        function($rootScope, $timeout,
-            gnMetadataManagerService) {
+      [
+        function() {
 
          return {
            restrict: 'A',

diff --git a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js
@@ -54,16 +54,16 @@
         }])
    .directive('gnAddThumbnail', [
         'gnOnlinesrc',
-        'gnMetadataManagerService',
+        'gnEditor',
         'gnOwsCapabilities',
-        function(gnOnlinesrc, gnMetadataManagerService, gnOwsCapabilities) {
+        function(gnOnlinesrc, gnEditor, gnOwsCapabilities) {
           return {
             restrict: 'A',
             templateUrl: '../../catalog/components/edit/onlinesrc/' +
                 'partials/addThumbnail.html',
             scope: {},
             link: function(scope, element, attrs) {
-              scope.metadataId = gnMetadataManagerService.
+              scope.metadataId = gnEditor.
                   getCurrentEdit().metadataId;
 
               // mode can be 'url' or 'upload'
@@ -72,9 +72,9 @@
               // the form params that will be submited
               scope.params = {};
 
-              // TODO: should be in gnMetadataManagerService ?
+              // TODO: should be in gnEditor ?
               var getVersion = function() {
-                return scope.params.version = $(gnMetadataManagerService.
+                return scope.params.version = $(gnEditor.
                     getCurrentEdit().formId).
                     find('input[id="version"]').val();
               };
@@ -85,7 +85,7 @@
                * Callback of the submit().
                */
               var uploadOnlinesrcDone = function(evt, data) {
-                gnMetadataManagerService.refreshEditorForm();
+                gnEditor.refreshEditorForm();
                 gnOnlinesrc.reload = true;
               };
 
@@ -110,7 +110,7 @@
               scope.addThumbnail = function() {
                 if (scope.mode == 'upload') {
                   getVersion();
-                  gnMetadataManagerService.save()
+                  gnEditor.save()
                   .then(function(data) {
                         scope.submit();
                       });
@@ -124,8 +124,8 @@
         }])
   .directive('gnAddOnlinesrc', ['gnOnlinesrc',
         'gnOwsCapabilities',
-        'gnMetadataManagerService',
-        function(gnOnlinesrc, gnOwsCapabilities, gnMetadataManagerService) {
+        'gnEditor',
+        function(gnOnlinesrc, gnOwsCapabilities, gnEditor) {
           return {
             restrict: 'A',
             templateUrl: '../../catalog/components/edit/onlinesrc/' +
@@ -181,7 +181,7 @@
               };
 
               scope.onAddSuccess = function() {
-                gnMetadataManagerService.refreshEditorForm();
+                gnEditor.refreshEditorForm();
                 scope.onlinesrcService.reload = true;
               };
 

diff --git a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcService.js b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcService.js
@@ -7,9 +7,9 @@
   module.factory('gnOnlinesrc', [
     'gnBatchProcessing',
     'gnHttp',
-    'gnMetadataManagerService',
+    'gnEditor',
     '$q',
-    function(gnBatchProcessing, gnHttp, gnMetadataManagerService, $q) {
+    function(gnBatchProcessing, gnHttp, gnEditor, $q) {
 
       var reload = false;
 
@@ -102,7 +102,7 @@
       };
 
       var refreshForm = function(scope, data) {
-        gnMetadataManagerService.refreshEditorForm(data);
+        gnEditor.refreshEditorForm(data);
         scope.reload = true;
       };
 
@@ -124,7 +124,7 @@
        * the form and reload the onlinesrc list.
        */
       var runService = function(service, params, scope) {
-        gnMetadataManagerService.save()
+        gnEditor.save()
         .then(function() {
               gnHttp.callService(service, params).success(function() {
                 refreshForm(scope);
@@ -162,7 +162,7 @@
 
           gnHttp.callService('getRelations', {
             fast: false,
-            id: gnMetadataManagerService.getCurrentEdit().metadataId
+            id: gnEditor.getCurrentEdit().metadataId
           }, {
             method: 'post',
             headers: {
@@ -210,7 +210,7 @@
 
           return gnBatchProcessing.runProcessMdXml({
             scopedName: qParams.name,
-            //            uuidref: gnMetadataManagerService.
+            //            uuidref: gnEditor.
             //            getCurrentEdit().metadataUuid,
             uuidref: '424d86a7-1d73-4e4b-bf50-c670936eb086',
             uuid: qParams.uuid,
@@ -246,7 +246,7 @@
           if (thumb.id.indexOf('resources.get') < 0) {
             runProcess(this,
                 setParams('thumbnail-remove', {
-                  id: gnMetadataManagerService.
+                  id: gnEditor.
                       getCurrentEdit().metadataId,
                   thumbnail_url: thumb.id
                 }));
@@ -255,8 +255,8 @@
           else {
             runService('removeThumbnail', {
               type: (thumb.title === 'thumbnail' ? 'small' : 'large'),
-              id: gnMetadataManagerService.getCurrentEdit().metadataId,
-              version: $(gnMetadataManagerService.getCurrentEdit().
+              id: gnEditor.getCurrentEdit().metadataId,
+              version: $(gnEditor.getCurrentEdit().
                   formId).find('input[id="version"]').val()
             }, this);
           }
@@ -267,20 +267,19 @@
 
           if (onlinesrc.protocol == 'WWW:DOWNLOAD-1.0-http--download') {
             runService('removeOnlinesrc', {
-              id: gnMetadataManagerService.
+              id: gnEditor.
                   getCurrentEdit().metadataId,
               url: onlinesrc.url,
               name: onlinesrc.name
             }, this);
           } else {
             runProcess(this,
                 setParams('onlinesrc-remove', {
-                  id: gnMetadataManagerService.
+                  id: gnEditor.
                       getCurrentEdit().metadataId,
                   url: onlinesrc.url,
                   name: onlinesrc.name
                 }));
-
           }
         }
       };

diff --git a/...metadatamanager/MetadataManagerService.js → ...mponents/metadatamanager/EditorService.js b/...metadatamanager/MetadataManagerService.js → ...mponents/metadatamanager/EditorService.js
@@ -47,7 +47,13 @@
     return Metadata;
   });
 
-  module.factory('gnMetadataManagerService',
+  /**
+   * Contains all the value of the current edited
+   * metadata (id, uuid, formId, version etc..)
+   */
+  module.value('gnCurrentEdit', {});
+
+  module.factory('gnEditor',
       ['$q',
        '$http',
        '$translate',

diff --git a/web-ui/src/main/resources/catalog/components/search/pagination/PaginationDirective.js b/web-ui/src/main/resources/catalog/components/search/pagination/PaginationDirective.js
@@ -3,8 +3,8 @@
 
   var module = angular.module('gn_pagination_directive', []);
 
-  module.directive('gnPagination', ['gnMetadataManagerService',
-                                    function(gnMetadataManagerService) {
+  module.directive('gnPagination', [
+                                    function() {
 
       return {
         restrict: 'A',

diff --git a/web-ui/src/main/resources/catalog/components/search/searchmanager/SearchResultsDirective.js b/web-ui/src/main/resources/catalog/components/search/searchmanager/SearchResultsDirective.js
@@ -4,8 +4,7 @@
   var module = angular.module('gn_search_form_results_directive', []);
 
   module.directive('gnSearchFormResults', [
-    'gnMetadataManagerService',
-    function(gnMetadataManagerService) {
+    function() {
 
       var activeClass = 'active';
 

diff --git a/web-ui/src/main/resources/catalog/components/thesaurus/ThesaurusDirective.js b/web-ui/src/main/resources/catalog/components/thesaurus/ThesaurusDirective.js
@@ -9,10 +9,10 @@
      */
   module.directive('gnThesaurusSelector',
       ['$http', '$rootScope', '$timeout',
-       'gnThesaurusService', 'gnMetadataManagerService',
+       'gnThesaurusService', 'gnEditor',
        'gnEditorXMLService',
        function($http, $rootScope, $timeout,
-       gnThesaurusService, gnMetadataManagerService,
+       gnThesaurusService, gnEditor,
        gnEditorXMLService) {
 
          return {
@@ -42,7 +42,7 @@
              });
 
              scope.add = function() {
-               gnMetadataManagerService.add(scope.metadataId,
+               gnEditor.add(scope.metadataId,
                    scope.elementRef, scope.elementName, scope.domId, 'before');
              };
 
@@ -53,13 +53,13 @@
                  // Add the fragment to the form
                  scope.snippet = gnEditorXMLService.
                  buildXML(scope.elementName, data);
-                 scope.snippetRef = gnMetadataManagerService.
+                 scope.snippetRef = gnEditor.
                  buildXMLFieldName(scope.elementRef, scope.elementName);
 
 
                  $timeout(function() {
                    // Save the metadata and refresh the form
-                   gnMetadataManagerService.save(scope.metadataId, true);
+                   gnEditor.save(scope.metadataId, true);
                  });
 
                });
@@ -76,10 +76,10 @@
      */
   module.directive('gnKeywordSelector',
       ['$http', '$rootScope', '$timeout',
-       'gnThesaurusService', 'gnMetadataManagerService',
+       'gnThesaurusService', 'gnEditor',
        'Keyword',
        function($http, $rootScope, $timeout,
-       gnThesaurusService, gnMetadataManagerService, Keyword) {
+       gnThesaurusService, gnEditor, Keyword) {
 
          return {
            restrict: 'A',

diff --git a/web-ui/src/main/resources/catalog/js/admin/AdminMetadataController.js b/web-ui/src/main/resources/catalog/js/admin/AdminMetadataController.js
@@ -12,11 +12,9 @@
    */
   module.controller('GnAdminMetadataController', [
     '$scope', '$routeParams', '$http', '$rootScope', '$translate', '$compile',
-    'gnMetadataManagerService',
     'gnSearchManagerService',
     'gnUtilityService',
     function($scope, $routeParams, $http, $rootScope, $translate, $compile,
-            gnMetadataManagerService, 
             gnSearchManagerService, 
             gnUtilityService) {