SessionStorage => LocalStorage

commit 76426e4 Author: Juanjo Ortilles <[email protected]> Date: Fri Jun 21 07:51:00 2024 +0200 Cambio de sessionStorage => LocalStorage (Vigilar mailing)
jortilles · Jun 28, 2024 · f6be6f4 · f6be6f4
1 parent d467367
commit f6be6f4
Show file tree

Hide file tree

Showing 15 changed files with 45 additions and 42 deletions.
diff --git a/eda/eda_api/lib/services/dashboardToPDFService/mail-dashboards.controller.ts b/eda/eda_api/lib/services/dashboardToPDFService/mail-dashboards.controller.ts
@@ -36,9 +36,9 @@ export class MailDashboardsController {
 
           await page.goto(`${serverConfig.server_baseURL}`)
           await page.evaluate((res) => {
-            sessionStorage.setItem('token', res.token);
-            sessionStorage.setItem('user', JSON.stringify(res.user));
-            sessionStorage.setItem('id', res.user._id)
+            localStorage.setItem('token', res.token);
+            localStorage.setItem('user', JSON.stringify(res.user));
+            localStorage.setItem('id', res.user._id)
           }, res);
 
 

diff --git a/eda/eda_app/src/app/core/pages/login/login.component.ts b/eda/eda_app/src/app/core/pages/login/login.component.ts
@@ -52,7 +52,7 @@ export class LoginComponent implements OnInit {
         // this.urlParams = this.route.snapshot.queryParams['params'];
         this.returnUrl = this.route.snapshot.queryParams['returnUrl'] || '/home';
 
-        this.email = sessionStorage.getItem('email') || '';
+        this.email = localStorage.getItem('email') || '';
 
         if (this.email.length > 1) {
             this.remember = true;

diff --git a/...eda_app/src/app/module/components/eda-panels/eda-blank-panel/eda-blank-panel.component.ts b/...eda_app/src/app/module/components/eda-panels/eda-blank-panel/eda-blank-panel.component.ts
@@ -236,7 +236,7 @@ export class EdaBlankPanelComponent implements OnInit {
     }
 
     getEditMode() {
-        const user = sessionStorage.getItem('user');
+        const user = localStorage.getItem('user');
         const userName = JSON.parse(user).name;
         return (userName !== 'edaanonim' && !this.inject.isObserver);
     }

diff --git a/...module/components/eda-panels/eda-blank-panel/link-dashboards/link-dashboards.component.ts b/...module/components/eda-panels/eda-blank-panel/link-dashboards/link-dashboards.component.ts
@@ -176,11 +176,14 @@ export class LinkDashboardsComponent extends EdaDialogAbstract {
 
             if (!this.controller.params.modeSQL) {
               res.dashboard.config.filters.forEach(filter => {
-
-                if (filter.column.value.column_name === column.col && filter.table.value === column.table) {
-                  disable = false;
+                if(filter.column){
+                  if (filter.column.value.column_name === column.col && filter.table.value === column.table) {
+                    disable = false;
+                  }
+                }else{
+                  console.log('NO SE HA IMPLEMENTADO TODAVÍA INFORMES VINCULADOS CON EL MODO ARBOL.');
+                  console.log(res.dashboard.config.title);
                 }
-
                 this.targetColumn = column.col;
                 this.targetTable = column.table;
 

diff --git a/...eda_app/src/app/module/components/eda-panels/eda-title-panel/eda-title-panel.component.ts b/...eda_app/src/app/module/components/eda-panels/eda-title-panel/eda-title-panel.component.ts
@@ -49,7 +49,7 @@ export class EdaTitlePanelComponent implements OnInit {
     }
 
     public setEditMode(): void {
-        const user = sessionStorage.getItem('user');
+        const user = localStorage.getItem('user');
         const userName = JSON.parse(user).name;
         this.display.editMode = (userName !== 'edaanonim' && !this.inject.isObserver);
     }

diff --git a/eda/eda_app/src/app/module/pages/dashboard/dashboard.component.ts b/eda/eda_app/src/app/module/pages/dashboard/dashboard.component.ts
@@ -137,7 +137,7 @@ export class DashboardComponent implements OnInit, AfterViewInit, OnDestroy {
         this.initializeResponsiveSizes();
         this.initializeGridsterOptions();
         this.initializeForm();
-        let tags = JSON.parse(sessionStorage.getItem('tags'));
+        let tags = JSON.parse(localStorage.getItem('tags'));
 
         if (tags) {
             this.tags = _.uniqBy(tags, 'value');
@@ -553,7 +553,7 @@ export class DashboardComponent implements OnInit, AfterViewInit, OnDestroy {
     // Dashboard Panels
     private initializePanels(): void {
 
-        const user = sessionStorage.getItem('user');
+        const user = localStorage.getItem('user');
         const userID = JSON.parse(user)._id;
 
         this.inject = {
@@ -607,7 +607,7 @@ export class DashboardComponent implements OnInit, AfterViewInit, OnDestroy {
 
     // Dashboard control
     public async setEditMode() {
-        const user = sessionStorage.getItem('user');
+        const user = localStorage.getItem('user');
         const userName = JSON.parse(user).name;
         const userID = JSON.parse(user)._id;
         this.display_v.edit_mode = (userName !== 'edaanonim') && !(this.grups.filter(group => group.name === 'EDA_RO' && group.users.includes(userID)).length !== 0)
@@ -1644,7 +1644,7 @@ export class DashboardComponent implements OnInit, AfterViewInit, OnDestroy {
             this.selectedTags.push(this.applyNewTag)
             this.addTag = !this.addTag;
             this.tags.push(tag)
-            sessionStorage.setItem('tags', JSON.stringify(this.tags));
+            localStorage.setItem('tags', JSON.stringify(this.tags));
         }
 
     }

diff --git a/..._app/src/app/module/pages/data-sources/data-source-detail/data-source-detail.component.ts b/..._app/src/app/module/pages/data-sources/data-source-detail/data-source-detail.component.ts
@@ -578,7 +578,7 @@ export class DataSourceDetailComponent implements OnInit, OnDestroy {
     }
     openNewViewDialog() {
         this.viewController = new EdaDialogController({
-            params: { user: sessionStorage.getItem('user'), model_id: this.dataModelService.model_id },
+            params: { user: localStorage.getItem('user'), model_id: this.dataModelService.model_id },
             close: (event, response) => {
                 if (!_.isEqual(event, EdaDialogCloseEvent.NONE)) {
                     this.dataModelService.addView(response);

diff --git a/eda/eda_app/src/app/module/pages/home/home.component.ts b/eda/eda_app/src/app/module/pages/home/home.component.ts
@@ -68,7 +68,7 @@ export class HomeComponent implements OnInit {
     private setIsObserver = async () => {
         this.groupService.getGroupsByUser().subscribe(
             res => {
-                const user = sessionStorage.getItem('user');
+                const user = localStorage.getItem('user');
                 const userID = JSON.parse(user)._id;
                 this.grups = res;
                 this.isObserver = this.grups.filter(group => group.name === 'EDA_RO' && group.users.includes(userID)).length !== 0
@@ -78,7 +78,7 @@ export class HomeComponent implements OnInit {
     }
 
     private ifAnonymousGetOut(): void {
-        const user = sessionStorage.getItem('user');
+        const user = localStorage.getItem('user');
         const userName = JSON.parse(user).name;
 
         if (userName === 'edaanonim' || userName === 'EDA_RO') {
@@ -128,7 +128,7 @@ export class HomeComponent implements OnInit {
                 }
             }
             this.tags = _.uniqBy(this.tags, 'value'); //treiem repetits
-            sessionStorage.setItem('tags', JSON.stringify(this.tags)); //IMPORTANT, guardem tags per sessió! Els recuperem a cada dashboard
+            localStorage.setItem('tags', JSON.stringify(this.tags)); //IMPORTANT, guardem tags per sessió! Els recuperem a cada dashboard
             this.filterDashboards({ label: this.AllTags, value: 1 });
             this.setIsObserver();
         } catch (err) {
@@ -227,7 +227,7 @@ export class HomeComponent implements OnInit {
         result = this.isAdmin ;
         if (result == false) {
             if (dashboard.config.onlyIcanEdit === true) {
-                if ( sessionStorage.getItem('user')  ==  dashboard.user) {
+                if ( localStorage.getItem('user')  ==  dashboard.user) {
                     result = true;
                 }
             } else {

diff --git a/eda/eda_app/src/app/module/pages/users-management/users-detail/users-detail.component.ts b/eda/eda_app/src/app/module/pages/users-management/users-detail/users-detail.component.ts
@@ -76,7 +76,7 @@ export class UsersFitxaComponent extends EdaDialogAbstract {
 
                 this.form.get('role').setValue(rolesNames);
 
-                this.iam = user.email === JSON.parse(sessionStorage.getItem('user')).email;
+                this.iam = user.email === JSON.parse(localStorage.getItem('user')).email;
             }, err => this.alertService.addError(err)
         );
     }

diff --git a/eda/eda_app/src/app/services/api/api.service.ts b/eda/eda_app/src/app/services/api/api.service.ts
@@ -52,7 +52,7 @@ export class ApiService {
     }
 
     private getSearchParamToken() {
-        const token = sessionStorage.getItem('token');
+        const token = localStorage.getItem('token');
         let params: HttpParams = new HttpParams();
 
         if (token) {

diff --git a/eda/eda_app/src/app/services/api/user.service.ts b/eda/eda_app/src/app/services/api/user.service.ts
@@ -82,9 +82,9 @@ export class UserService extends ApiService {
 
     /** Save User and Token in localstorage */
     savingStorage(id: string, token: string, user: User) {
-        sessionStorage.setItem('id', id);
-        sessionStorage.setItem('token', token);
-        sessionStorage.setItem('user', JSON.stringify(user));
+        localStorage.setItem('id', id);
+        localStorage.setItem('token', token);
+        localStorage.setItem('user', JSON.stringify(user));
 
         this.user = user;
         this.token = token;
@@ -104,9 +104,9 @@ export class UserService extends ApiService {
     /** Login user into app */
     login(user: User, remember: boolean): Observable<any> {
         if (remember) {
-            sessionStorage.setItem('email', user.email);
+            localStorage.setItem('email', user.email);
         } else {
-            sessionStorage.removeItem('email');
+            localStorage.removeItem('email');
         }
 
         return this.post(`${this.route}/login`, user, true)
@@ -133,7 +133,7 @@ export class UserService extends ApiService {
         return this.get( `${this.route}/refresh-token` )
             .pipe(map((res: any) => {
                     this.token = res.token;
-                    sessionStorage.setItem('token', this.token);
+                    localStorage.setItem('token', this.token);
 
                     return true;
                 })
@@ -152,9 +152,9 @@ export class UserService extends ApiService {
 
     /** Load items localstorage */
     loadStorage() {
-        if (sessionStorage.getItem('token')) {
-            this.token = sessionStorage.getItem('token');
-            this.user = JSON.parse(sessionStorage.getItem('user'));
+        if (localStorage.getItem('token')) {
+            this.token = localStorage.getItem('token');
+            this.user = JSON.parse(localStorage.getItem('user'));
 
             this.getIsAdminUser(this.user._id).subscribe(
                 (value: any) => this.isAdmin = value.isAdmin,
@@ -175,16 +175,16 @@ export class UserService extends ApiService {
 
     /** Verify if user is logged */
     isLogged() {
-        return this.token.length > 5 || !!sessionStorage.getItem('token');
+        return this.token.length > 5 || !!localStorage.getItem('token');
     }
 
     /** Logout user and clean localstorage */
     logout() {
         this.user = null;
         this.token = '';
 
-        sessionStorage.removeItem('user');
-        sessionStorage.removeItem('token');
+        localStorage.removeItem('user');
+        localStorage.removeItem('token');
 
         this.router.navigate(['/login']);
     }
@@ -207,11 +207,11 @@ export class UserService extends ApiService {
     }
 
     getUserObject(){
-        return JSON.parse(sessionStorage.getItem('user'));
+        return JSON.parse(localStorage.getItem('user'));
     }
 
     getToken(){
-        return sessionStorage.getItem('token');
+        return localStorage.getItem('token');
     }
 }
 
diff --git a/eda/eda_app/src/app/services/utils/file-utils.service.ts b/eda/eda_app/src/app/services/utils/file-utils.service.ts
@@ -6,7 +6,7 @@ import * as _ from 'lodash';
 export class FileUtiles {
 
     connection(route: string, getParams?: {}) {
-        let url = `${URL_SERVICES}${route}?token=${sessionStorage.getItem('token')}`;
+        let url = `${URL_SERVICES}${route}?token=${localStorage.getItem('token')}`;
         if (!_.isNil(getParams)) {
             _.forEach(getParams, (value: any, key: any) => {
                 url += '&' + key + '=' + value;

diff --git a/eda/eda_app/src/app/services/utils/query-builder.service.ts b/eda/eda_app/src/app/services/utils/query-builder.service.ts
@@ -49,7 +49,7 @@ export class QueryBuilderService extends ApiService {
             id: '1',
             model_id: params.dataSource,
             user: {
-                user_id: sessionStorage.getItem('id'),
+                user_id: localStorage.getItem('id'),
                 user_roles: ['USER_ROLE']
             },
             dashboard: {
@@ -108,7 +108,7 @@ export class QueryBuilderService extends ApiService {
             id: '1',
             model_id: params.dataSource,
             user: {
-                user_id: sessionStorage.getItem('id'),
+                user_id: localStorage.getItem('id'),
                 user_roles: ['USER_ROLE']
             },
             dashboard: {

diff --git a/eda/eda_app/src/app/services/utils/settings.service.ts b/eda/eda_app/src/app/services/utils/settings.service.ts
@@ -15,12 +15,12 @@ export class SettingsService {
     }
 
     saveSettings() {
-        sessionStorage.setItem('settings', JSON.stringify(this.settings));
+        localStorage.setItem('settings', JSON.stringify(this.settings));
     }
 
     loadingSettings() {
-        if (sessionStorage.getItem('settings')) {
-            this.settings = JSON.parse(sessionStorage.getItem('settings'));
+        if (localStorage.getItem('settings')) {
+            this.settings = JSON.parse(localStorage.getItem('settings'));
             this.applyTheme(this.settings.tema);
         } else {
             this.applyTheme(this.settings.tema);

diff --git a/eda/eda_app/src/app/shared/components/sidebar/sidebar.component.ts b/eda/eda_app/src/app/shared/components/sidebar/sidebar.component.ts
@@ -106,7 +106,7 @@ export class SidebarComponent implements OnInit {
     }
 
     setEditMode(): void {
-        const user = sessionStorage.getItem('user');
+        const user = localStorage.getItem('user');
         const userName = JSON.parse(user).name;
         this.edit_mode = (userName !== 'edaanonim');
     }