modalReviewd

src/app/services/publications.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, OnInit } from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import { environment } from 'src/environments/environment';
 import { AuthService } from '../services/auth.service';
@@ -6,20 +6,27 @@ import { LoginUserRespose } from '../models/user.model';
 import { Observable, throwError } from 'rxjs';
 import { catchError } from 'rxjs/operators'
 import { Publication } from '../models/publication';
+import { getUrl } from 'ionicons/dist/types/components/icon/utils';
+import { ActivatedRoute, Router } from '@angular/router';
 
 @Injectable({
   providedIn: 'root'
 })
-export class PublicationsService {
+export class PublicationsService  {
+
+ 
 
   authheader = {};
   loggeduser: LoginUserRespose;
   headers: HttpHeaders;
 
-  constructor(private http: HttpClient, user: AuthService) { 
+  constructor(private http: HttpClient, user: AuthService,
+    private activatedRoute: ActivatedRoute,
+    private router: Router) { 
     this.loggeduser = user.ValidatedUser;
     this.headers = new HttpHeaders();
     this.headers = this.headers.set('Authorization', this.loggeduser.BasicAuthKey);
+    
   }
 
   GetPublicationFolderList(){
@@ -77,6 +84,7 @@ export class PublicationsService {
     return this.http.delete<any>(`${geturl}`, options);
   }
 
+  //this worker obervable goes to ForkJoin as a second api call
   GetPublications(id:any){
     const geturl = environment.apiURL + 'presidentialActions/'+ id +'/posts';
     let params = new HttpParams();
@@ -90,6 +98,20 @@ export class PublicationsService {
     return this.http.get<Publication[]>(`${geturl}`, options)
   }
 
+  // this one too,goes to observable as a first  api call
+  GetIdsPublicationsImages(id:any){
+    const geturl = environment.apiURL + 'presidentialActions/'+ id +'/posts/ids';
+    let params = new HttpParams();
+
+    params = params.set("folderId", id);
+
+    let options = { 
+      headers: this.headers,
+      params: params
+    };
+    return this.http.get<number[]>(`${geturl}`, options)
+  }
+
   GetPublicationById( publicationId:any){
     const geturl = environment.apiURL + 'presidentialActions/posts/'+ publicationId;
     let params = new HttpParams();
@@ -103,6 +125,60 @@ export class PublicationsService {
     return this.http.get<any>(`${geturl}`, options);
   }
   
+// my own tries
+
+GetPublicationByIdNext( publicationId:any){
+  let geturl = environment.apiURL + 'presidentialActions/'+ publicationId + '/posts/ids';
+  let params = new HttpParams();
+
+  params = params.set("folderId", publicationId); 
+
+  let options = { 
+    headers: this.headers,
+    /* params: params */
+  };
+
+  const imageLoads = !!(+localStorage.getItem('loadedimage'))
+  if(imageLoads){
+    return true
+  }else{
+    const navigation = this.router.getCurrentNavigation()
+    console.log('nav:', navigation)
+
+    if(navigation){
+      geturl = navigation.extractedUrl.toString()
+    }
+
+  this.router.navigate([URL], {queryParams: {returnto: geturl}})
+
+  }
+}
+
+GetIdsPublicationNext(id:any){
+  let geturl = environment.apiURL + 'presidentialActions/posts/' + id;
+  let params = new HttpParams();
+
+  params = params.set("id", id);
+
+  let options = { 
+    headers: this.headers,
+    params: params
+  };
+
+ var search = this.http.get<any>(`${geturl}`, options).subscribe(
+   res => {
+     res.this.activatedRoute.snapshot.queryParams.get('returnto') || '/posts'
+     
+    }
+  
+ )
+
+ return search
+   
+}
+
+//my last tries
+
   CreatePublication(folderId:any,body:any){
     const geturl = environment.apiURL + 'presidentialActions/'+folderId+'/posts';
     let params = new HttpParams();