/modules/uoa-services-library/trunk/ng-openaire-library/src/app/utils/fetchEntitiesClasses/fetchDataproviders.class.ts - Diff - D-Net - D-Net project tracking tool

« Previous | Next »

Revision 59816

Added by Argiro Kokogiannaki over 3 years ago

[Library|Trunk]

code clean up:
-remove app.* files from library
-remove unused imports, code, files (Old search pages for results, dataproviders, map search page, etc)
-remove Freeguard from modules
-unsubscribe all subscriptions
-Services: configuration, isvocabularies, user management: unsubscribe from app component or the component that uses them (clearSubscriptions())
-Fetchers: unsubscribe from the component that uses them (clearSubscriptions())

     import {SearchCustomFilter, SearchUtilsClass} from '../../searchPages/searchUtils/searchUtils.class';
     import {EnvProperties} from '../../utils/properties/env-properties';
     import {StringUtils} from '../../utils/string-utils.class';
     import {Subscriber} from "rxjs";
     export class FetchDataproviders {
       private errorCodes: ErrorCodes;
-...
       public results = [];
       public searchUtils: SearchUtilsClass = new SearchUtilsClass();
       public sub: any;
       public subResults: any;
       subscriptions = [];
       public CSV: any = {
         "columnNames": ["Title", "Type", "Coutries", "Compatibility"],
         "export": []
-...
         this.errorMessages = new ErrorMessagesComponent();
         this.searchUtils.status = this.errorCodes.LOADING;
+      }
       public ngOnDestroy() {
         if (this.sub) {
           this.sub.unsubscribe();
+        }
         if (this.subResults) {
           this.subResults.unsubscribe();
+        }
       public clearSubscriptions() {
         this.subscriptions.forEach(subscription => {
           if (subscription instanceof Subscriber) {
             subscription.unsubscribe();
+          }
         });
+      }
       public getResultsByKeyword(keyword: string, page: number, size: number, properties: EnvProperties, customFilter: SearchCustomFilter = null) {
-...
         if (customFilter) {
           refineParams = (refineParams ? (refineParams + '&') : '') + "&fq=" + StringUtils.URIEncode(customFilter.queryFieldName + " exact " + StringUtils.quote((customFilter.valueId)));
+        }
         this.subResults = this._searchDataprovidersService.searchDataproviders(parameters, refineParams, page, size, [], properties).subscribe(
         this.subscriptions.push(this._searchDataprovidersService.searchDataproviders(parameters, refineParams, page, size, [], properties).subscribe(
           data => {
             this.searchUtils.totalResults = data[0];
             //console.info("search Content Providers: [Parameters:"+parameters+" ]  [total results:"+this.searchUtils.totalResults+"]");
-...
             this.handleError("Error getting content providers for keyword: " + keyword, err);
             this.searchUtils.status = this.errorMessages.getErrorCode(err.status);
+          }
         );
         ));
+      }
       public getResultsForHome(size: number, properties: EnvProperties) {
-...
         var parameters = "&sortBy=resultdateofacceptance,descending";//"orderby=date";
         this.searchUtils.status = this.errorCodes.LOADING;
         this.subResults = this._searchDataprovidersService.searchDataproviders(parameters, null, page, size, [], properties).subscribe(
         this.subscriptions.push(this._searchDataprovidersService.searchDataproviders(parameters, null, page, size, [], properties).subscribe(
           data => {
             this.searchUtils.totalResults = data[0];
             //console.info("search Content Providers: [Parameters:"+parameters+" ]  [total results:"+this.searchUtils.totalResults+"]");
-...
             this.handleError("Error getting content providers with parameters: " + parameters + " for Home", err);
             this.searchUtils.status = this.errorMessages.getErrorCode(err.status);
+          }
         );
         ));
+      }
       public getNumForEntity(entity: string, id: string, properties: EnvProperties) {
-...
         this.searchUtils.status = this.errorCodes.LOADING;
         if (id != "" && entity != "") {
           this._searchDataprovidersService.numOfEntityDataproviders(id, entity, properties).subscribe(
           this.subscriptions.push(this._searchDataprovidersService.numOfEntityDataproviders(id, entity, properties).subscribe(
             data => {
               this.searchUtils.totalResults = data;
-...
               this.handleError("Error getting content providers for " + entity + " with id: " + id, err);
               this.searchUtils.status = this.errorMessages.getErrorCode(err.status);
+            }
           );
           ));
+        }
+      }
       public getNumForSearch(keyword: string, properties: EnvProperties, refineParams: string = null) {
         //var errorCodes:ErrorCodes = new ErrorCodes();
         this.searchUtils.status = this.errorCodes.LOADING;
         this._searchDataprovidersService.numOfSearchDataproviders(keyword, properties, refineParams).subscribe(
         this.subscriptions.push(this._searchDataprovidersService.numOfSearchDataproviders(keyword, properties, refineParams).subscribe(
           data => {
             this.searchUtils.totalResults = data;
             this.searchUtils.status = this.errorCodes.DONE;
-...
             this.handleError("Error getting number of content providers for keyword: " + keyword, err);
             this.searchUtils.status = this.errorMessages.getErrorCode(err.status);
+          }
         );
         ));
+      }
       public getResultsForDeposit(id: string, type: string, page: number, size: number, properties: EnvProperties) {
-...
         this.loadPaging = false;
         if (id != "") {
           this._searchDataprovidersService.searchDataprovidersForDeposit(id, type, page, size, properties).subscribe(
           this.subscriptions.push(this._searchDataprovidersService.searchDataprovidersForDeposit(id, type, page, size, properties).subscribe(
             data => {
               this.searchUtils.totalResults = data[0];
               //console.info("search Dataproviders forDeposit: [id:"+id+", type:"+type+" ]  [total results:"+this.searchUtils.totalResults+"]");
-...
               this.loadPaging = true;
               this.oldTotalResults = 0;
+            }
           );
           ));
+        }
+      }
-...
         this.results = [];
         this.searchUtils.totalResults = 0;
         this.loadPaging = false;
         this._searchDataprovidersService.searchDataProvidersBySubjects(subject, type, page, size, properties).subscribe(
         this.subscriptions.push(this._searchDataprovidersService.searchDataProvidersBySubjects(subject, type, page, size, properties).subscribe(
           data => {
             this.searchUtils.totalResults = data[0];
             //console.info("search Dataproviders forDeposit: [subject:"+subject+", type:"+type+" ]  [total results:"+this.searchUtils.totalResults+"]");
-...
             this.loadPaging = true;
             this.oldTotalResults = 0;
+          }
         );
         ));
+      }
-...
+        }
         if (parameters != "") {
           this._searchDataprovidersService.searchDataprovidersForEntity(parameters, page, size, properties).subscribe(
           this.subscriptions.push(this._searchDataprovidersService.searchDataprovidersForEntity(parameters, page, size, properties).subscribe(
             data => {
               this.searchUtils.totalResults = data[0];
               //console.info("search Dataproviders for "+entity+": [Parameters:"+parameters+" ]  [total results:"+this.searchUtils.totalResults+"]");
-...
               this.handleError("Error getting content providers for " + entity + " with id: " + id, err);
               this.searchUtils.status = this.errorMessages.getErrorCode(err.status);
+            }
           );
           ));
+        }
+      }
       public getResultsForDataproviders(id: string, page: number, size: number, properties: EnvProperties) {
         //var errorCodes:ErrorCodes = new ErrorCodes();
         this.searchUtils.status = this.errorCodes.LOADING;
         this._searchDataprovidersService.getDataProvidersforEntityRegistry(id, page, size, properties).subscribe(
         this.subscriptions.push(this._searchDataprovidersService.getDataProvidersforEntityRegistry(id, page, size, properties).subscribe(
           data => {
             this.searchUtils.totalResults = data[0];
             //console.info("search Dataproviders for Entity Registry: [Id:"+id+" ]  [total results:"+this.searchUtils.totalResults+"]");
-...
             this.handleError("Error getting content providers for entity registry with id: " + id, err);
             this.searchUtils.status = this.errorMessages.getErrorCode(err.status);
+          }
         );
         ));
+      }
       private handleError(message: string, error) {

Also available in: Unified diff

Project

General

Profile

D-Net

Revision 59816

Added by Argiro Kokogiannaki over 3 years ago