diff --git a/src/app/interceptors/token.interceptors.ts b/src/app/interceptors/token.interceptors.ts index fa6b6c66e..2d8027338 100644 --- a/src/app/interceptors/token.interceptors.ts +++ b/src/app/interceptors/token.interceptors.ts @@ -114,23 +114,23 @@ export class TokenInterceptor implements HttpInterceptor { }), catchError((error) => { console.log(error) - // SessionStore.user.Authorization = SessionStore.user.Authorization; - // SessionStore.user.RefreshToken = SessionStore.user.RefreshToken; - // SessionStore.setInativity(false) - // /* SessionStore.setUrlBeforeInactivity(this.router.url); */ + SessionStore.user.Authorization = SessionStore.user.Authorization; + SessionStore.user.RefreshToken = SessionStore.user.RefreshToken; + SessionStore.setInativity(false) + /* SessionStore.setUrlBeforeInactivity(this.router.url); */ - // if (environment.production) { - // window.location.pathname = '/auth' - // } else { - // const pathBeforeGoOut = window.location.pathname - // console.log('Before auth',window.location.pathname) - // this.router.navigateByUrl('/auth', { replaceUrl: true }).then(() =>{ - // if(pathBeforeGoOut != "/auth") { - // this.httpErrorHandle.httpsSucessMessagge('sessonExpired') - // } + if (environment.production) { + window.location.pathname = '/auth' + } else { + const pathBeforeGoOut = window.location.pathname + console.log('Before auth',window.location.pathname) + this.router.navigateByUrl('/auth', { replaceUrl: true }).then(() =>{ + if(pathBeforeGoOut != "/auth") { + this.httpErrorHandle.httpsSucessMessagge('sessonExpired') + } - // }) - // } + }) + } return of(false); }) ); diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index 34c6ef866..ba8df922d 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -175,27 +175,7 @@ export class NewPublicationPage implements OnInit { } - ngOnInit() { - // this.reciveSharedContent(); - - // this.setTitle(); - // Filesystem.mkdir({ - // path: IMAGE_DIR, - // directory: Directory.Data, - // recursive: true - // }); - - /* try { - document.addEventListener("click", clickOutside, false); - function clickOutside(e) { - const inside = document.getElementById('container-multiselect').contains(e.target); - this.photoOrVideo = false; - console.log(this.photoOrVideo) - } - } catch (error) { - console.log('click butto', error) - } */ - } + ngOnInit() {} // in use async takePicture() { diff --git a/src/app/shared/publication/upload/publication-from-mv.service.ts b/src/app/shared/publication/upload/publication-from-mv.service.ts index df99f1f6c..4158ddabc 100644 --- a/src/app/shared/publication/upload/publication-from-mv.service.ts +++ b/src/app/shared/publication/upload/publication-from-mv.service.ts @@ -56,7 +56,7 @@ export class PublicationFromMvService { this.ObjectMergeNotification = new ObjectMergeNotification() this.totalPercentage = 0 - // this.ObjectMergeNotification.connect(); + this.ObjectMergeNotification.connect(); window['upload-header-set-add'](this.id, this.totalPercentage, this.save) } diff --git a/version/git-version.ts b/version/git-version.ts index 8fb436d88..2738ccccc 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,11 +1,11 @@ export let versionData = { - "shortSHA": "e4a0e4c83", - "SHA": "e4a0e4c83b54762a7ba68eed8ae8085972dcb7d7", + "shortSHA": "c91086fce", + "SHA": "c91086fcef5c7628592c4cf3985e13bd39ddeefa", "branch": "feature/agenda-api-peter", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri Jul 26 12:42:30 2024 +0100'", - "lastCommitMessage": "fix swiper", - "lastCommitNumber": "5885", - "changeStatus": "On branch feature/agenda-api-peter\nYour branch is up to date with 'origin/feature/agenda-api-peter'.\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/services/monitoring/opentelemetry/logging.ts\n\tmodified: src/app/services/monitoring/opentelemetry/tracer.ts\n\tmodified: version/git-version.ts", + "lastCommitTime": "'Fri Jul 26 15:28:38 2024 +0100'", + "lastCommitMessage": "dont send logs on production", + "lastCommitNumber": "5886", + "changeStatus": "On branch feature/agenda-api-peter\nYour branch is ahead of 'origin/feature/agenda-api-peter' by 1 commit.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/interceptors/token.interceptors.ts\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/shared/publication/upload/publication-from-mv.service.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file