/ - Diff - D-Net - D-Net project tracking tool

« Previous | Next »

Revision 59352

Added by Konstantina Galouni over 3 years ago

1. help-content.service.ts:
a. Improve method names.
b. Change paths for community related methods to be in the form "/portalType/pid/..." (needed for authorization in service).
2. affiliations.component.ts: Replace "getPageByRoute()" with "getCommunityPageByRoute()".
3. divId-form.component.ts: No need to read "communityId" url param | Replace "getPages()" with "getAllPages()".
4. divIds.component.ts: Replace "getDivIdsFull()" with "getAllDivIdsFull()".
5. div-help-content-form.component.ts: Replace "getDivIdsFull()" with "getDivIdsFullByPageAndPortal()".
6. div-help-contents.component.ts: Replace "getPage()" with "getPageByPortal()" | In "deleteDivHelpContents()" and "toggleDivHelpContents()" add pid parameter.
7. edit-div-help-content.component.ts: Replace "getPage()" with "getPageByPortal()" | In "getDivHelpContent()", "getDivIdFull()" and "insertOrUpdateDivHelpContent()" add pid parameter.
8. new-div-help-content.component.ts: Replace "getPage()" with "getPageByPortal()" | In "insertOrUpdateDivHelpContent()" add pid parameter.
9. edit-page-help-content.component.ts: Replace "getPage()" with "getPageByPortal()" | In "getPageHelpContent()" and "updatePageHelpContent()" add pid parameter.
10 .new-page-help-content.component.ts: Replace "getPage()" with "getPageByPortal()" | In "savePageHelpContent()" add pid parameter.
11. page-help-content-form.component.ts: Replace "getPage()" with "getPageByPortal()" | Replace "getPages()" with "getCommunityPagesWithPositions()".
12. page-help-contents.component.ts:
a. Replace "getPage()" with "getPageByPortal()" OR "getCommunityPagesWithPositions()".
b. In "deletePageHelpContents()" and "togglePageHelpContents()" add pid parameter.
13. edit-htmlpage-content.component.ts: Replace "getPage()" with "getPageByPortal()".
14. pages.component.ts:
a. Replace "getCommunityPages()" with "getCommunityPagesByType()".
b. Replace "getPagesFull()" with "getAllPagesFull()".
c. Rename "getPagesFromDivIds()" to "getPageIdsFromDivIds()".

                      if(!this.pageId) {
                          this.myForm.valueChanges.subscribe(value => {
                              let pageId = value.page;
                              this._helpContentService.getPage(pageId, this.properties.adminToolsAPIURL).subscribe(page => {
                              this._helpContentService.getPageByPortal(pageId, this.properties.adminToolsAPIURL, this.communityPid).subscribe(page => {
                                 this.setPlacements(page);
                              });
                          });
+                     }
                      this._helpContentService.getPages(this.properties.adminToolsAPIURL, this.communityPid, true).subscribe(
                      this._helpContentService.getCommunityPagesWithPositions(this.communityPid, this.properties.adminToolsAPIURL).subscribe(
                        pages => {
                            this.availablePages = pages;
                            this.showLoading = false;

+        }
         private getPage(pageId: string) {
           this._helpContentService.getPage(pageId,this.properties.adminToolsAPIURL).subscribe(
           this._helpContentService.getPageByPortal(pageId,this.properties.adminToolsAPIURL, this.communityPid).subscribe(
             page => {
               // if( (this.communityPid == 'openaire' && !page.openaire)
               //   || (this.communityPid == 'connect' && !page.connect)
-...
             this.errorMessage = "";
             this.updateErrorMessage = "";
             this._helpContentService.getPageHelpContent(pageContentId as string, this.properties.adminToolsAPIURL).subscribe(
             this._helpContentService.getPageHelpContent(pageContentId as string, this.properties.adminToolsAPIURL, this.communityPid).subscribe(
               pageHelpContent => {
                 if(this.pageId && this.pageId != pageHelpContent.page) {
                   this.router.navigate(['/pageContents'], { queryParams: { "communityId": this.communityPid} });
-...
                 this.updateErrorMessage = "";
                 let pageHelpContent : PageHelpContent = this.formComponent.myForm.value;
                 this._helpContentService.updatePageHelpContent(pageHelpContent, this.properties.adminToolsAPIURL).subscribe(
                 this._helpContentService.updatePageHelpContent(pageHelpContent, this.properties.adminToolsAPIURL, this.communityPid).subscribe(
                     _ => {
                       if(this.pageId) {
                         this.router.navigate( ['/pageContents/'], { queryParams: { "communityId": this.communityPid, "pageId": this.pageId  } } );

             this.updateErrorMessage = "";
             this.errorMessage = "";
             this._helpService.getPage(pageId, this.properties.adminToolsAPIURL).subscribe(
             this._helpService.getPageByPortal(pageId, this.properties.adminToolsAPIURL, this.selectedCommunityPid).subscribe(
                 page => {
                     // if( (this.selectedCommunityPid == 'openaire' && !page.openaire)
                     //     || (this.selectedCommunityPid == 'connect' && !page.connect)
-...
             this.errorMessage = "";
             //this._helpService.getCommunityPages(community_pid, "", this.properties.adminToolsAPIURL).subscribe(
             this._helpService.getPages(this.properties.adminToolsAPIURL, community_pid, true).subscribe(
             this._helpService.getCommunityPagesWithPositions(community_pid, this.properties.adminToolsAPIURL).subscribe(
               pages => {
                   this.pages = pages;
                   this.getPageHelpContents(this.selectedCommunityPid);
-...
             this.showLoading = true;
             this.updateErrorMessage = "";
             this._helpService.deletePageHelpContents(this.selectedPageContents, this.properties.adminToolsAPIURL).subscribe(
             this._helpService.deletePageHelpContents(this.selectedPageContents, this.properties.adminToolsAPIURL, this.selectedCommunityPid).subscribe(
                 _ => {
                   this.deletePageHelpContentsFromArray(this.selectedPageContents);
                   this.showLoading = false;
-...
           } else {
             this.updateErrorMessage = "";
             this._helpService.togglePageHelpContents(ids,status, this.properties.adminToolsAPIURL).subscribe(
             this._helpService.togglePageHelpContents(ids,status, this.properties.adminToolsAPIURL, this.selectedCommunityPid).subscribe(
                 () => {
                     for(let id of ids) {
                         let i = this.checkboxes.findIndex(_ => _.pageHelpContent._id == id);

+        }
       private getPage(pageId: string) {
         this._helpContentService.getPage(pageId,this.properties.adminToolsAPIURL).subscribe(
         this._helpContentService.getPageByPortal(pageId,this.properties.adminToolsAPIURL, this.communityPid).subscribe(
           page => {
             // if( (this.communityPid == 'openaire' && !page.openaire)
             //   || (this.communityPid == 'connect' && !page.connect)
-...
                 let pageHelpContent : PageHelpContent = this.formComponent.myForm.value;
                 this._helpContentService.savePageHelpContent(pageHelpContent, this.properties.adminToolsAPIURL).subscribe(
                 this._helpContentService.savePageHelpContent(pageHelpContent, this.properties.adminToolsAPIURL, this.communityPid).subscribe(
                     _ => {
                       if(this.pageId) {
                         this.router.navigate( ['/pageContents/'], { queryParams: { "communityId": this.communityPid, "pageId": this.pageId  } } );

             //this.showLoading = true;
             this.errorMessage = '';
             this._helpContentService.getDivIdsFull(pageId, this.properties.adminToolsAPIURL, this.communityPid).subscribe(
             this._helpContentService.getDivIdsFullByPageAndPortal(pageId, this.properties.adminToolsAPIURL, this.communityPid).subscribe(
                 divs => {
                   this.availableDivs = divs;
                   this.pageId = pageId;

             this.showLoading = true;
             this.updateErrorMessage = "";
             this.errorMessage = "";
             this._helpService.getPage(pageId, this.properties.adminToolsAPIURL).subscribe(
             this._helpService.getPageByPortal(pageId, this.properties.adminToolsAPIURL, this.selectedCommunityPid).subscribe(
                 page => {
                   // if( (this.selectedCommunityPid == 'openaire' && !page.openaire)
                   //   || (this.selectedCommunityPid == 'connect' && !page.connect)
-...
             this.showLoading = true;
             this.updateErrorMessage = "";
             this._helpService.deleteDivHelpContents(this.selectedDivContents, this.properties.adminToolsAPIURL).subscribe(
             this._helpService.deleteDivHelpContents(this.selectedDivContents, this.properties.adminToolsAPIURL, this.selectedCommunityPid).subscribe(
                 _ => {
                   this.deleteDivHelpContentsFromArray(this.selectedDivContents);
                   this.showLoading = false;
-...
           } else {
             this.updateErrorMessage = "";
             this._helpService.toggleDivHelpContents(ids,status, this.properties.adminToolsAPIURL).subscribe(
             this._helpService.toggleDivHelpContents(ids,status, this.properties.adminToolsAPIURL, this.selectedCommunityPid).subscribe(
                 () => {
                     for(let id of ids) {
                         let i = this.checkboxes.findIndex(_ => _.divHelpContent._id == id);

+        }
         private getPage(pageId: string) {
           this._helpContentService.getPage(pageId,this.properties.adminToolsAPIURL).subscribe(
           this._helpContentService.getPageByPortal(pageId,this.properties.adminToolsAPIURL, this.communityPid).subscribe(
             page => {
               // if( (this.communityPid == 'openaire' && !page.openaire)
               //   || (this.communityPid == 'connect' && !page.connect)
-...
             this.errorMessage = "";
             this.updateErrorMessage = "";
             this._helpContentService.getDivHelpContent(divContentId, this.properties.adminToolsAPIURL).subscribe(
             this._helpContentService.getDivHelpContent(divContentId, this.properties.adminToolsAPIURL, this.communityPid).subscribe(
                 divHelpContent => {
                   if(this.pageId) {
                     this.getPage(this.pageId);
-...
           } else {
             this.showLoading = true;
             this._helpContentService.getDivIdFull(divId, this.properties.adminToolsAPIURL).subscribe(
             this._helpContentService.getDivIdFull(divId, this.properties.adminToolsAPIURL, this.communityPid).subscribe(
               div => {
                 this.formComponent.selectedDiv = div;
-...
                 let divHelpContent : DivHelpContent = this.formComponent.myForm.value;
                 this._helpContentService.insertOrUpdateDivHelpContent(divHelpContent, this.properties.adminToolsAPIURL).subscribe(
                 this._helpContentService.insertOrUpdateDivHelpContent(divHelpContent, this.properties.adminToolsAPIURL, this.communityPid).subscribe(
                     _ => {
                       if(this.pageId) {
                         this.router.navigate( ['/classContents/'], { queryParams: { "communityId": this.communityPid, "pageId": this.pageId  } } );

+        }
         private getPage(pageId: string) {
           this._helpContentService.getPage(pageId,this.properties.adminToolsAPIURL).subscribe(
           this._helpContentService.getPageByPortal(pageId,this.properties.adminToolsAPIURL, this.communityPid).subscribe(
             page => {
               // if( (this.communityPid == 'openaire' && !page.openaire)
               //   || (this.communityPid == 'connect' && !page.connect)
-...
                 let divHelpContent : DivHelpContent = this.formComponent.myForm.value;
                 this._helpContentService.insertOrUpdateDivHelpContent(divHelpContent, this.properties.adminToolsAPIURL).subscribe(
                 this._helpContentService.insertOrUpdateDivHelpContent(divHelpContent, this.properties.adminToolsAPIURL, this.communityPid).subscribe(
                     _ => {
                       if(this.pageId) {
                         this.router.navigate( ['/classContents/'], { queryParams: { "communityId": this.communityPid, "pageId": this.pageId  } } );

           if(!Session.isLoggedIn()){
             this.router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl":  this.router.url} });
           } else {
             this._helpContentService.getPage(pageId, this.properties.adminToolsAPIURL).subscribe(
             this._helpContentService.getPageByPortal(pageId, this.properties.adminToolsAPIURL, this.communityPid).subscribe(
               page => {
                 this.pageName = page.name;
                 this.getHtmlPageContent(communityId, page.route);

           this.route.data
             .subscribe((data: { envSpecific: EnvProperties }) => {
                this.properties = data.envSpecific;
                this.route.queryParams.subscribe(params => {
                  this.selectedCommunityPid = params['communityId'];
                });
                // this.route.queryParams.subscribe(params => {
                //   this.selectedCommunityPid = params['communityId'];
                // });
              });
+        }
-...
             this.showLoading = true;
             this.errorMessage = "";
             this._helpContentService.getPages(this.properties.adminToolsAPIURL,this.selectedCommunityPid).subscribe(
             this._helpContentService.getAllPages(this.properties.adminToolsAPIURL).subscribe(
               pages => {
                 //this.allPages = allPages;
                 for(let page of pages) {

             this.updateErrorMessage = "";
             this.errorMessage = "";
             this._helpContentService.getDivIdsFull(null, this.properties.adminToolsAPIURL).subscribe(
             this._helpContentService.getAllDivIdsFull(this.properties.adminToolsAPIURL).subscribe(
                 divIds => {
                     this.divIds = divIds;
                     this.checkboxes = [];

+      }
       getOrganizationsPageId() {
         this._helpContentService.getPageByRoute("/organizations", this.properties.adminToolsAPIURL).subscribe(
         this._helpContentService.getCommunityPageByRoute("/organizations", this.properties.adminToolsAPIURL, this.communityId).subscribe(
           pages => {
             if(pages && pages[0]) {
               this.organizationsPageId = pages[0]._id;

             parameters = '?page_type=' + this.pagesType;
+          }
           if (community_pid) {
             this._helpContentService.getCommunityPages(community_pid, parameters, this.properties.adminToolsAPIURL).subscribe(
             this._helpContentService.getCommunityPagesByType(community_pid, this.pagesType, this.properties.adminToolsAPIURL).subscribe(
               pages => {
                 this.pagesReturned(pages);
                 //if(!this.pagesType || this.pagesType == "link") {
-...
               error => this.handleError('System error retrieving pages', error)
             );
           } else {
             this._helpContentService.getPagesFull(this.properties.adminToolsAPIURL, null).subscribe(
             this._helpContentService.getAllPagesFull(this.properties.adminToolsAPIURL).subscribe(
               pages => {
                 this.pagesReturned(pages);
                 this.showLoading = false;
-...
         if (!Session.isLoggedIn()) {
           this._router.navigate(['/user-info'], {queryParams: {'errorCode': LoginErrorCodes.NOT_VALID, 'redirectUrl': this._router.url}});
         } else {
           this._helpContentService.getPagesWithDivIds(community_pid, this.properties.adminToolsAPIURL).subscribe(
           this._helpContentService.getPageIdsFromDivIds(community_pid, this.properties.adminToolsAPIURL).subscribe(
             pages => {
               this.pageWithDivIds = pages;
               this.showLoading = false;

     @Injectable()
     export class HelpContentService {
         constructor(private http:HttpClient) {
+        }
       constructor(private http:HttpClient) {
+      }
         static removeNulls(obj){
             var isArray = obj instanceof Array;
             for (var k in obj){
                 if (obj[k]===null || obj[k]==='') isArray ? obj.splice(k,1) : delete obj[k];
                 else if (typeof obj[k]=="object") HelpContentService.removeNulls(obj[k]);
+            }
+        }
         getDivIdsFull(page_id: string, helpContentUrl:string, pid: string = null) {
           let parameters: string = "";
           if(page_id || pid) {
             parameters = "?";
             if(page_id) {
               parameters += "&page="+page_id;
+            }
             if(pid) {
               parameters += "&portal="+pid;
+            }
       static removeNulls(obj){
           var isArray = obj instanceof Array;
           for (var k in obj){
               if (obj[k]===null || obj[k]==='') isArray ? obj.splice(k,1) : delete obj[k];
               else if (typeof obj[k]=="object") HelpContentService.removeNulls(obj[k]);
+          }
+      }
           return this.http.get<Array<DivId>>(helpContentUrl + 'divFull'+parameters)
               //.map(res => <Array<DivId>> res.json())
               .pipe(catchError(this.handleError));
+        }
       getEntities(helpContentUrl:string) {
         return this.http.get<Array<Entity>>(helpContentUrl + 'entity')
         //.map(res => <Array<Entity>> res.json())
           .pipe(catchError(this.handleError));
+      }
         updateDivId(divId: DivId, helpContentUrl:string) {
             HelpContentService.removeNulls(divId);
       saveEntity(entity: Entity, helpContentUrl:string) {
         HelpContentService.removeNulls(entity);
             return this.http.post<DivId>(helpContentUrl + 'div/update', JSON.stringify(divId), CustomOptions.getAuthOptionsWithBody())
                 //.map(res => <DivId> res.json())
                 .pipe(catchError(this.handleError));
+        }
         return this.http.post<Entity>(helpContentUrl + 'entity/save', JSON.stringify(entity), CustomOptions.getAuthOptionsWithBody())
         //.map(res => <Entity> res.json())
           .pipe(catchError(this.handleError));
+      }
         getDivId(divId: string, helpContentUrl:string) {
             return this.http.get<DivId>(helpContentUrl + 'div/'+divId)
                 //.map(res => <DivId> res.json())
                 .pipe(catchError(this.handleError));
+        }
       updateEntity(entity: Entity, helpContentUrl:string) {
         HelpContentService.removeNulls(entity);
         getDivIdFull(divId: string, helpContentUrl:string) {
             return this.http.get<DivId>(helpContentUrl + 'divFull/'+divId)
                 //.map(res => <DivId> res.json())
                 .pipe(catchError(this.handleError));
+        }
         return this.http.post<Entity>(helpContentUrl + 'entity/update', JSON.stringify(entity), CustomOptions.getAuthOptionsWithBody())
         //.map(res => <Entity> res.json())
           .pipe(catchError(this.handleError));
+      }
         saveDivId(divId: DivId, helpContentUrl:string) {
             HelpContentService.removeNulls(divId);
       deleteEntities(ids : string[], helpContentUrl:string) {
         return this.http.post(helpContentUrl + 'entity/delete',JSON.stringify(ids), CustomOptions.getAuthOptionsWithBody())
           .pipe(catchError(this.handleError));
+      }
             return this.http.post<DivId>(helpContentUrl + 'div/save', JSON.stringify(divId), CustomOptions.getAuthOptionsWithBody())
                 //.map(res => <DivId> res.json())
                 .pipe(catchError(this.handleError));
+        }
     /*
         getCommunitiesWithDivId(helpContentUrl:string) {
             return this.http.get(helpContentUrl + 'community?div=true')
                 .map(res => <Array<Portal>> res.json())
                 .catch(this.handleError);
+        }
     */
         getCommunityPagesWithDivId(portal_pid: string, helpContentUrl:string) {
             return this.http.get<Array<Page>>(helpContentUrl + properties.adminToolsPortalType + '/'+portal_pid+'/pages?div=true')
                 //.map(res => <Array<Page>> res.json())
                 .pipe(catchError(this.handleError));
+        }
       // toggleEntity(selectedCommunityId: string, id : string,status : boolean) {
       //     let headers = new Headers({'Content-Type': 'application/json'});
       //     let options = new RequestOptions({headers: headers});
       //
       //     return this.http.post(helpContentUrl + 'community/'+selectedCommunityId+'/entity/toggle?status='+ status.toString()+'&entityId='+id.toString(), options)
       //         .catch(this.handleError);
       // }
         getCommunityDivHelpContents(portal_pid: string, helpContentUrl:string) {
           return this.http.get<Array<DivHelpContent>>(helpContentUrl + 'divhelpcontent?portal='+portal_pid)
               //.map(res => <Array<DivHelpContent>> res.json())
               .pipe(catchError(this.handleError));
+        }
       getCommunityEntities(pid: string, helpContentUrl:string) {
         return this.http.get<Array<Entity>>(helpContentUrl + properties.adminToolsPortalType + '/'+pid+'/entities')
         //.map(res => <Array<Entity>> res.json())
           .pipe(catchError(this.handleError));
+      }
         getDivHelpContent(id : string, helpContentUrl:string) {
           return this.http.get<DivHelpContent>(helpContentUrl + 'divhelpcontent/' + id)
               //.map(res => <DivHelpContent> res.json())
               .pipe(catchError(this.handleError));
+        }
       toggleEntities(pid: string, ids : string[],status : boolean, helpContentUrl:string) {
         insertOrUpdateDivHelpContent(divHelpContent: DivHelpContent, helpContentUrl:string) {
             HelpContentService.removeNulls(divHelpContent);
         return this.http.post(helpContentUrl + properties.adminToolsPortalType + '/'+pid+ '/entity/toggle?status='+ status.toString(),
                                 JSON.stringify(ids), CustomOptions.getAuthOptionsWithBody())
         //.map( res => <string[]> res.json())
           .pipe(catchError(this.handleError));
+      }
             return this.http.post<DivHelpContent>(helpContentUrl + 'divhelpcontent', JSON.stringify(divHelpContent), CustomOptions.getAuthOptionsWithBody())
                 //.map(res => <DivHelpContent> res.json())
                 .pipe(catchError(this.handleError));
+        }
       // unused
       toggleEntityOfPage(pageId: string, entityId : string,status : boolean, helpContentUrl:string) {
         return this.http.post(helpContentUrl + 'page/'+pageId+'/entity/toggle?status='+ status.toString()+'&entityId='+entityId.toString(),
                                 CustomOptions.getAuthOptionsWithBody())
           .pipe(catchError(this.handleError));
+      }
         deleteDivIds(ids : string[], helpContentUrl:string) {
             return this.http.post(helpContentUrl + 'div/delete',JSON.stringify(ids), CustomOptions.getAuthOptionsWithBody())
                 .pipe(catchError(this.handleError));
+        }
       // getDivIdsFull(page_id: string, helpContentUrl:string, pid: string = null) {
       //   let parameters: string = "";
       //   if(page_id || pid) {
       //     parameters = "?";
       //     if(page_id) {
       //       parameters += "&page="+page_id;
       //     }
       //     if(pid) {
       //       parameters += "&portal="+pid;
       //     }
       //   }
       //
       //   return this.http.get<Array<DivId>>(helpContentUrl + 'div/full'+parameters)
       //       //.map(res => <Array<DivId>> res.json())
       //       .pipe(catchError(this.handleError));
       // }
         deleteDivHelpContents(ids : string[], helpContentUrl:string) {
              return this.http.post(helpContentUrl + 'divhelpcontent/delete',JSON.stringify(ids), CustomOptions.getAuthOptionsWithBody())
                 .pipe(catchError(this.handleError));
+        }
       // Replacing getDivIdsFull
       getAllDivIdsFull(helpContentUrl:string) {
         return this.http.get<Array<DivId>>(helpContentUrl + 'div/full')
         //.map(res => <Array<DivId>> res.json())
           .pipe(catchError(this.handleError));
+      }
         toggleDivHelpContents(ids : string[],status : boolean, helpContentUrl:string) {
       getDivIdsFullByPageAndPortal(page_id: string, helpContentUrl:string, pid: string) {
         let parameters: string = "?&page="+page_id;
             return this.http.post(helpContentUrl + 'divhelpcontent/toggle?status='+ status.toString(), JSON.stringify(ids), CustomOptions.getAuthOptionsWithBody())
                 //.map( res => <string[]> res.json())
                 .pipe(catchError(this.handleError));
+        }
         return this.http.get<Array<DivId>>(helpContentUrl + properties.adminToolsPortalType + '/'+pid + '/div/full'+parameters)
           .pipe(catchError(this.handleError));
+      }
       // End of replacing getDivIdsFull
         getPagesWithDivIds(portal_pid: string, helpContentUrl:string) {
             let parameters = (portal_pid ? "?portal="+portal_pid : "");
             return this.http.get<Array<string>>(helpContentUrl + 'div/pages'+parameters)
                 //.map(res => <Map<string, Set<string>>> res.json())
                 .pipe(catchError(this.handleError));
+        }
       // unused
       getDivId(divId: string, helpContentUrl:string) {
           return this.http.get<DivId>(helpContentUrl + 'div/'+divId)
               //.map(res => <DivId> res.json())
               .pipe(catchError(this.handleError));
+      }
         getPages(helpContentUrl:string,pid:string,with_positions:boolean=null) {
             let parameters: string = "";
             if(pid || with_positions == true || with_positions == false) {
               parameters = "?";
               if(pid) {
                 parameters += "&pid="+pid;
+              }
               if(with_positions == true || with_positions == false) {
                 parameters += "&with_positions="+with_positions;
+              }
+            }
             return this.http.get<Array<Page>>(helpContentUrl + 'page'+parameters)
                 //.map(res => <Array<Page>> res.json())
                 .pipe(catchError(this.handleError));
+        }
       getDivIdFull(divId: string, helpContentUrl:string, pid: string) {
           return this.http.get<DivId>(helpContentUrl + properties.adminToolsPortalType + "/" + pid + '/div/'+divId+"/full")
               //.map(res => <DivId> res.json())
               .pipe(catchError(this.handleError));
+      }
         getPagesFull(helpContentUrl:string,pid:string) {
             return this.http.get<Array<Page>>(helpContentUrl + 'pageFull'+(pid?("?pid="+pid):""))
             //.map(res => <Array<Page>> res.json())
       updateDivId(divId: DivId, helpContentUrl:string) {
         HelpContentService.removeNulls(divId);
         return this.http.post<DivId>(helpContentUrl + 'div/update', JSON.stringify(divId), CustomOptions.getAuthOptionsWithBody())
         //.map(res => <DivId> res.json())
           .pipe(catchError(this.handleError));
+      }
       saveDivId(divId: DivId, helpContentUrl:string) {
           HelpContentService.removeNulls(divId);
           return this.http.post<DivId>(helpContentUrl + 'div/save', JSON.stringify(divId), CustomOptions.getAuthOptionsWithBody())
               //.map(res => <DivId> res.json())
               .pipe(catchError(this.handleError));
+        }
+      }
         getPage(pageId:string, helpContentUrl:string) {
             return this.http.get<Page>(helpContentUrl + 'page/'+pageId)
                 //.map(res => <Page> res.json())
                 .pipe(catchError(this.handleError));
+        }
       deleteDivIds(ids : string[], helpContentUrl:string) {
         return this.http.post(helpContentUrl + 'div/delete',JSON.stringify(ids), CustomOptions.getAuthOptionsWithBody())
           .pipe(catchError(this.handleError));
+      }
         getPageByRoute(route:string, helpContentUrl:string) {
           return this.http.get<Page>(helpContentUrl + 'page/?page_route='+route)
       getPageIdsFromDivIds(pid: string, helpContentUrl:string) {
         //let parameters = (pid ? "?portal="+pid : "");
         return this.http.get<Array<string>>(helpContentUrl + properties.adminToolsPortalType + "/" + pid + '/div/pages')
         //.map(res => <Map<string, Set<string>>> res.json())
           .pipe(catchError(this.handleError));
+      }
     /*
       getCommunitiesWithDivId(helpContentUrl:string) {
           return this.http.get(helpContentUrl + 'community?div=true')
               .map(res => <Array<Portal>> res.json())
               .catch(this.handleError);
+      }
     */
       getCommunityDivHelpContents(pid: string, helpContentUrl:string) {
         return this.http.get<Array<DivHelpContent>>(helpContentUrl + properties.adminToolsPortalType + "/" + pid + '/divhelpcontent')
             //.map(res => <Array<DivHelpContent>> res.json())
             .pipe(catchError(this.handleError));
+        }
+      }
         getCommunities( helpContentUrl:string) {
             return this.http.get<Array<Portal>>(helpContentUrl + properties.adminToolsPortalType)
                 //.map(res => <Array<Portal>> res.json())
                 .pipe(catchError(this.handleError));
+        }
       getDivHelpContent(id : string, helpContentUrl:string, pid: string) {
         return this.http.get<DivHelpContent>(helpContentUrl + properties.adminToolsPortalType + "/" + pid + '/divhelpcontent/' + id)
             //.map(res => <DivHelpContent> res.json())
             .pipe(catchError(this.handleError));
+      }
         getCommunity(portal_pid: string, helpContentUrl:string) {
             return this.http.get<Portal>(helpContentUrl + properties.adminToolsPortalType + '/'+portal_pid)
                 //.map(res => <Portal> res.json())
                 .pipe(catchError(this.handleError));
+        }
       insertOrUpdateDivHelpContent(divHelpContent: DivHelpContent, helpContentUrl:string, pid: string) {
           HelpContentService.removeNulls(divHelpContent);
         getCommunitiesFull( helpContentUrl:string) {
             return this.http.get<Array<Portal>>(helpContentUrl + properties.adminToolsPortalType + 'Full')
                 //.map(res => <Array<Portal>> res.json())
                 .pipe(catchError(this.handleError));
+        }
           return this.http.post<DivHelpContent>(helpContentUrl + properties.adminToolsPortalType + "/" + pid + '/divhelpcontent',
                                                   JSON.stringify(divHelpContent), CustomOptions.getAuthOptionsWithBody())
               //.map(res => <DivHelpContent> res.json())
               .pipe(catchError(this.handleError));
+      }
         getCommunityFull(portal_pid: string, helpContentUrl:string) {
             return this.http.get<Portal>(helpContentUrl + properties.adminToolsPortalType + 'Full/'+portal_pid)
                 //.map(res => <Portal> res.json())
                 .pipe(catchError(this.handleError));
+        }
       deleteDivHelpContents(ids : string[], helpContentUrl:string, pid: string) {
            return this.http.post(helpContentUrl + properties.adminToolsPortalType + "/" + pid + '/divhelpcontent/delete',
                                     JSON.stringify(ids), CustomOptions.getAuthOptionsWithBody())
               .pipe(catchError(this.handleError));
+      }
         saveCommunity(portal: Portal, helpContentUrl:string) {
             // let headers = new Headers({'Content-Type': 'application/json'});
             // let options = new RequestOptions({headers: headers});
       toggleDivHelpContents(ids : string[],status : boolean, helpContentUrl:string, pid: string) {
             HelpContentService.removeNulls(portal);
           return this.http.post(helpContentUrl + properties.adminToolsPortalType + '/' + pid + '/divhelpcontent/toggle?status='+ status.toString(),
                                   JSON.stringify(ids), CustomOptions.getAuthOptionsWithBody())
               //.map( res => <string[]> res.json())
               .pipe(catchError(this.handleError));
+      }
             return this.http.post<Portal>(helpContentUrl + portal.type + '/save', JSON.stringify(portal), CustomOptions.getAuthOptionsWithBody())
             //.map(res => <Portal> res.json())
                 .pipe(catchError(this.handleError));
+        }
       // unused
       getPageHelpContents(helpContentUrl:string) {
         return this.http.get<Array<PageHelpContent>>(helpContentUrl + 'pagehelpcontent')
         //.map(res => <Array<PageHelpContent>> res.json())
           .pipe(catchError(this.handleError));
+      }
         updateCommunity(portal: Portal, helpContentUrl:string) {
             // let headers = new Headers({'Content-Type': 'application/json'});
             // let options = new RequestOptions({headers: headers});
       getCommunityPageHelpContents(pid: string, helpContentUrl:string) {
         return this.http.get<Array<PageHelpContent>>(helpContentUrl + properties.adminToolsPortalType + '/' + pid + '/pagehelpcontent')
         //.map(res => <Array<PageHelpContent>> res.json())
           .pipe(catchError(this.handleError));
+      }
             HelpContentService.removeNulls(portal);
       getPageHelpContent(id : string, helpContentUrl:string, pid: string) {
         return this.http.get<PageHelpContent>(helpContentUrl + properties.adminToolsPortalType + '/' + pid + '/pagehelpcontent/' + id)
         //.map(res => <PageHelpContent> res.json())
           .pipe(catchError(this.handleError));
+      }
             return this.http.post<Portal>(helpContentUrl + portal.type + '/update', JSON.stringify(portal),  CustomOptions.getAuthOptionsWithBody())
                 //.map(res => <Portal> res.json())
                 .pipe(catchError(this.handleError));
+        }
       savePageHelpContent(pageHelpContent: PageHelpContent, helpContentUrl:string, pid: string) {
         HelpContentService.removeNulls(pageHelpContent);
         deleteCommunities(ids : string[], helpContentUrl:string) {
             // let headers = new Headers({'Content-Type': 'application/json'});
             // let options = new RequestOptions({headers: headers});
         return this.http.post<PageHelpContent>(helpContentUrl + properties.adminToolsPortalType + '/' + pid + '/pagehelpcontent/save',
                                               JSON.stringify(pageHelpContent), CustomOptions.getAuthOptionsWithBody())
         //.map(res => <PageHelpContent> res.json())
           .pipe(catchError(this.handleError));
+      }
             return this.http.post(helpContentUrl + properties.adminToolsPortalType + '/delete',JSON.stringify(ids), CustomOptions.getAuthOptionsWithBody())
                 .pipe(catchError(this.handleError));
+        }
       updatePageHelpContent(pageHelpContent: PageHelpContent, helpContentUrl:string, pid: string) {
         HelpContentService.removeNulls(pageHelpContent);
         getCommunityPages(portal_pid: string, params: string, helpContentUrl:string) {
             return this.http.get<Array<Page>>(helpContentUrl + properties.adminToolsPortalType + '/'+portal_pid+'/pages'+params)
                 //.map(res => <Array<Page>> res.json())
                 .pipe(catchError(this.handleError));
+        }
         return this.http.post<PageHelpContent>(helpContentUrl + properties.adminToolsPortalType + '/' + pid +'/pagehelpcontent/update',
                                               JSON.stringify(pageHelpContent), CustomOptions.getAuthOptionsWithBody())
         //.map(res => <PageHelpContent> res.json())
           .pipe(catchError(this.handleError));
+      }
         getEntities(helpContentUrl:string) {
             return this.http.get<Array<Entity>>(helpContentUrl + 'entity')
                 //.map(res => <Array<Entity>> res.json())
                 .pipe(catchError(this.handleError));
+        }
       deletePageHelpContents(ids : string[], helpContentUrl:string, pid: string) {
         return this.http.post(helpContentUrl + properties.adminToolsPortalType + '/' + pid + '/pagehelpcontent/delete',
                                 JSON.stringify(ids), CustomOptions.getAuthOptionsWithBody())
           .pipe(catchError(this.handleError));
+      }
         getCommunityEntities(portal_pid: string, helpContentUrl:string) {
             return this.http.get<Array<Entity>>(helpContentUrl + properties.adminToolsPortalType + '/'+portal_pid+'/entities')
                 //.map(res => <Array<Entity>> res.json())
                 .pipe(catchError(this.handleError));
+        }
       togglePageHelpContents(ids : string[],status : boolean, helpContentUrl:string, pid: string) {
         return this.http.post(helpContentUrl + properties.adminToolsPortalType + '/' + pid + '/pagehelpcontent/toggle?status='+ status.toString(),
                                 JSON.stringify(ids), CustomOptions.getAuthOptionsWithBody())
         //.map( res => <string[]> res.json())
           .pipe(catchError(this.handleError));
+      }
       getCommunityPagesWithDivId(pid: string, helpContentUrl:string) {
         return this.http.get<Array<Page>>(helpContentUrl + properties.adminToolsPortalType + '/'+pid+'/pages?div=true')
         //.map(res => <Array<Page>> res.json())
           .pipe(catchError(this.handleError));
+      }
         saveEntity(entity: Entity, helpContentUrl:string) {
             HelpContentService.removeNulls(entity);
       // getCommunityPages(pid: string, params: string, helpContentUrl:string) {
       //   return this.http.get<Array<Page>>(helpContentUrl + properties.adminToolsPortalType + '/'+pid+'/pages'+params, CustomOptions.getAuthOptions())
       //   //.map(res => <Array<Page>> res.json())
       //     .pipe(catchError(this.handleError));
       // }
             return this.http.post<Entity>(helpContentUrl + 'entity/save', JSON.stringify(entity), CustomOptions.getAuthOptionsWithBody())
                 //.map(res => <Entity> res.json())
                 .pipe(catchError(this.handleError));
+        }
       // Replacing getCommunityPages
       getCommunityPagesByType(pid: string, type: string, helpContentUrl:string) {
         return this.http.get<Array<Page>>(helpContentUrl + properties.adminToolsPortalType + '/'+pid+'/pages'
                                             + (type ? '?page_type='+type : ''))
         //.map(res => <Array<Page>> res.json())
           .pipe(catchError(this.handleError));
+      }
       // End of replacing getCommunityPages
         updateEntity(entity: Entity, helpContentUrl:string) {
             HelpContentService.removeNulls(entity);
       // Replacing part of getPages (now getAllPages)
       getCommunityPagesWithPositions(pid: string, helpContentUrl:string) {
         return this.http.get<Array<Page>>(helpContentUrl + properties.adminToolsPortalType + '/'+pid+'/pages?with_positions=true')
         //.map(res => <Array<Page>> res.json())
           .pipe(catchError(this.handleError));
+      }
       // End of replacing part of getPages (now getAllPages)
             return this.http.post<Entity>(helpContentUrl + 'entity/update', JSON.stringify(entity), CustomOptions.getAuthOptionsWithBody())
                 //.map(res => <Entity> res.json())
                 .pipe(catchError(this.handleError));
+        }
       getAllPages(helpContentUrl:string) {//,pid:string,with_positions:boolean=null) {
           // let parameters: string = "";
           // if(pid || with_positions == true || with_positions == false) {
           //   parameters = "?";
           //   if(pid) {
           //     parameters += "&pid="+pid;
           //   }
           //   if(with_positions == true || with_positions == false) {
           //     parameters += "&with_positions="+with_positions;
           //   }
           // }
           return this.http.get<Array<Page>>(helpContentUrl + 'page')
               //.map(res => <Array<Page>> res.json())
               .pipe(catchError(this.handleError));
+      }
         // toggleEntity(selectedCommunityId: string, id : string,status : boolean) {
         //     let headers = new Headers({'Content-Type': 'application/json'});
         //     let options = new RequestOptions({headers: headers});
         //
         //     return this.http.post(helpContentUrl + 'community/'+selectedCommunityId+'/entity/toggle?status='+ status.toString()+'&entityId='+id.toString(), options)
         //         .catch(this.handleError);
         // }
       getAllPagesFull(helpContentUrl:string) {
           return this.http.get<Array<Page>>(helpContentUrl + 'page/full')//+(pid?("?pid="+pid):""))
           //.map(res => <Array<Page>> res.json())
             .pipe(catchError(this.handleError));
+      }
         toggleEntities(selectedPortalPid: string, ids : string[],status : boolean, helpContentUrl:string) {
       getPageByPortal(pageId:string, helpContentUrl:string, pid: string) {
           return this.http.get<Page>(helpContentUrl + properties.adminToolsPortalType + '/' + pid + '/page/'+pageId)
               //.map(res => <Page> res.json())
               .pipe(catchError(this.handleError));
+      }
             return this.http.post(helpContentUrl + properties.adminToolsPortalType + '/'+selectedPortalPid+ '/entity/toggle?status='+ status.toString(), JSON.stringify(ids), CustomOptions.getAuthOptionsWithBody())
                 //.map( res => <string[]> res.json())
                 .pipe(catchError(this.handleError));
+        }
       getCommunityPageByRoute(route:string, helpContentUrl:string, pid: string) {
         return this.http.get<Page>(helpContentUrl + properties.adminToolsPortalType +'/' + pid + '/page/?page_route='+route)
           .pipe(catchError(this.handleError));
+      }
         deleteEntities(ids : string[], helpContentUrl:string) {
             return this.http.post(helpContentUrl + 'entity/delete',JSON.stringify(ids), CustomOptions.getAuthOptionsWithBody())
                 .pipe(catchError(this.handleError));
+        }
       savePage(page: Page, helpContentUrl:string) {
         HelpContentService.removeNulls(page);
         return this.http.post<Page>(helpContentUrl + 'page/save', JSON.stringify(page), CustomOptions.getAuthOptionsWithBody())
         //.map(res => <Page> res.json())
           .pipe(catchError(this.handleError));
+      }
         toggleEntityOfPage(pageId: string, entityId : string,status : boolean, helpContentUrl:string) {
             return this.http.post(helpContentUrl + 'page/'+pageId+'/entity/toggle?status='+ status.toString()+'&entityId='+entityId.toString(), CustomOptions.getAuthOptionsWithBody())
                 .pipe(catchError(this.handleError));
+        }
       updatePage(page: Page, helpContentUrl:string) {
         savePage(page: Page, helpContentUrl:string) {
              HelpContentService.removeNulls(page);
         HelpContentService.removeNulls(page);
             return this.http.post<Page>(helpContentUrl + 'page/save', JSON.stringify(page), CustomOptions.getAuthOptionsWithBody())
                 //.map(res => <Page> res.json())
                 .pipe(catchError(this.handleError));
+        }
         return this.http.post<Page>(helpContentUrl + 'page/update', JSON.stringify(page), CustomOptions.getAuthOptionsWithBody())
         //.map(res => <Page> res.json())
           .pipe(catchError(this.handleError));
+      }
         updatePage(page: Page, helpContentUrl:string) {
       togglePages(selectedPortalPid: string, ids : string[],status : boolean, helpContentUrl:string) {
             HelpContentService.removeNulls(page);
         return this.http.post(helpContentUrl + properties.adminToolsPortalType + '/'+selectedPortalPid+'/page/toggle?status='+ status.toString(),
                                 JSON.stringify(ids), CustomOptions.getAuthOptionsWithBody())
           .pipe(catchError(this.handleError));
+      }
             return this.http.post<Page>(helpContentUrl + 'page/update', JSON.stringify(page), CustomOptions.getAuthOptionsWithBody())
                 //.map(res => <Page> res.json())
                 .pipe(catchError(this.handleError));
+        }
       deletePages(ids : string[], helpContentUrl:string) {
         togglePages(selectedPortalPid: string, ids : string[],status : boolean, helpContentUrl:string) {
         return this.http.post(helpContentUrl + 'page/delete',JSON.stringify(ids), CustomOptions.getAuthOptionsWithBody())
           .pipe(catchError(this.handleError));
+      }
             return this.http.post(helpContentUrl + properties.adminToolsPortalType + '/'+selectedPortalPid+'/page/toggle?status='+ status.toString(),JSON.stringify(ids), CustomOptions.getAuthOptionsWithBody())
                 .pipe(catchError(this.handleError));
+        }
       // unused
       getCommunities( helpContentUrl:string) {
           return this.http.get<Array<Portal>>(helpContentUrl + properties.adminToolsPortalType)
               //.map(res => <Array<Portal>> res.json())
               .pipe(catchError(this.handleError));
+      }
         deletePages(ids : string[], helpContentUrl:string) {
       getCommunity(pid: string, helpContentUrl:string) {
           return this.http.get<Portal>(helpContentUrl + properties.adminToolsPortalType + '/'+pid)
               //.map(res => <Portal> res.json())
               .pipe(catchError(this.handleError));
+      }
             return this.http.post(helpContentUrl + 'page/delete',JSON.stringify(ids), CustomOptions.getAuthOptionsWithBody())
                 .pipe(catchError(this.handleError));
+        }
       getCommunitiesFull( helpContentUrl:string) {
           return this.http.get<Array<Portal>>(helpContentUrl + properties.adminToolsPortalType + '/full')
               //.map(res => <Array<Portal>> res.json())
               .pipe(catchError(this.handleError));
+      }
         getPageHelpContents(helpContentUrl:string) {
             return this.http.get<Array<PageHelpContent>>(helpContentUrl + 'pagehelpcontent')
                 //.map(res => <Array<PageHelpContent>> res.json())
                 .pipe(catchError(this.handleError));
+        }
       getCommunityFull(portal_pid: string, helpContentUrl:string) {
           return this.http.get<Portal>(helpContentUrl + properties.adminToolsPortalType + '/'+portal_pid+'/full')
               //.map(res => <Portal> res.json())
               .pipe(catchError(this.handleError));
+      }
         getCommunityPageHelpContents(portal_pid: string, helpContentUrl:string) {
             return this.http.get<Array<PageHelpContent>>(helpContentUrl + 'pagehelpcontent?portal='+portal_pid)
                 //.map(res => <Array<PageHelpContent>> res.json())
                 .pipe(catchError(this.handleError));
+        }
       saveCommunity(portal: Portal, helpContentUrl:string) {
           // let headers = new Headers({'Content-Type': 'application/json'});
           // let options = new RequestOptions({headers: headers});
         getPageHelpContent(id : string, helpContentUrl:string) {
             return this.http.get<PageHelpContent>(helpContentUrl + 'pagehelpcontent/' + id)
                 //.map(res => <PageHelpContent> res.json())
                 .pipe(catchError(this.handleError));
+        }
           HelpContentService.removeNulls(portal);
         savePageHelpContent(pageHelpContent: PageHelpContent, helpContentUrl:string) {
             HelpContentService.removeNulls(pageHelpContent);
           return this.http.post<Portal>(helpContentUrl + portal.type + '/save', JSON.stringify(portal), CustomOptions.getAuthOptionsWithBody())
           //.map(res => <Portal> res.json())
               .pipe(catchError(this.handleError));
+      }
             return this.http.post<PageHelpContent>(helpContentUrl + 'pagehelpcontent/save', JSON.stringify(pageHelpContent), CustomOptions.getAuthOptionsWithBody())
                 //.map(res => <PageHelpContent> res.json())
                 .pipe(catchError(this.handleError));
+        }
       updateCommunity(portal: Portal, helpContentUrl:string) {
           // let headers = new Headers({'Content-Type': 'application/json'});
           // let options = new RequestOptions({headers: headers});
         updatePageHelpContent(pageHelpContent: PageHelpContent, helpContentUrl:string) {
             HelpContentService.removeNulls(pageHelpContent);
           HelpContentService.removeNulls(portal);
             return this.http.post<PageHelpContent>(helpContentUrl + 'pagehelpcontent/update', JSON.stringify(pageHelpContent), CustomOptions.getAuthOptionsWithBody())
                 //.map(res => <PageHelpContent> res.json())
                 .pipe(catchError(this.handleError));
+        }
           return this.http.post<Portal>(helpContentUrl + portal.type + '/update', JSON.stringify(portal),  CustomOptions.getAuthOptionsWithBody())
               //.map(res => <Portal> res.json())
               .pipe(catchError(this.handleError));
+      }
         deletePageHelpContents(ids : string[], helpContentUrl:string) {
               return this.http.post(helpContentUrl + 'pagehelpcontent/delete',JSON.stringify(ids), CustomOptions.getAuthOptionsWithBody())
                   .pipe(catchError(this.handleError));
+        }
       deleteCommunities(ids : string[], helpContentUrl:string) {
           // let headers = new Headers({'Content-Type': 'application/json'});
           // let options = new RequestOptions({headers: headers});
         togglePageHelpContents(ids : string[],status : boolean, helpContentUrl:string) {
             return this.http.post(helpContentUrl + 'pagehelpcontent/toggle?status='+ status.toString(), JSON.stringify(ids), CustomOptions.getAuthOptionsWithBody())
                 //.map( res => <string[]> res.json())
                 .pipe(catchError(this.handleError));
+        }
           return this.http.post(helpContentUrl + properties.adminToolsPortalType + '/delete',JSON.stringify(ids), CustomOptions.getAuthOptionsWithBody())
               .pipe(catchError(this.handleError));
+      }
         private handleError(error: HttpErrorResponse) {
             // in a real world app, we may send the error to some remote logging infrastructure
             // instead of just logging it to the console
             console.error(error);
             return Observable.throw(error.error || 'Server error');
+        }
       private handleError(error: HttpErrorResponse) {
           // in a real world app, we may send the error to some remote logging infrastructure
           // instead of just logging it to the console
           console.error(error);
           return Observable.throw(error.error || 'Server error');
+      }
         // getDataProviders() {
         //     return this.http.get('https://beta.services.openaire.eu/search/v2/api/datasources?format=json').map(res => <any> res.json()).map(res => res.results).do(res => {console.log(res)}).catch(this.handleError);

Also available in: Unified diff

Project

General

Profile

D-Net

Revision 59352

Added by Konstantina Galouni over 3 years ago