service: add new service to load organisation before application start

projects/admin/src/app/app.component.ts

@@ -24,6 +24,7 @@ import { Router, NavigationStart } from '@angular/router';
 import { filter } from 'rxjs/operators';
 import { LibrarySwitchService } from './service/library-switch.service';
 import { Subscription } from 'rxjs';
+import { OrganisationService } from './service/organisation.service';
 
 @Component({
   selector: 'admin-root',
@@ -61,7 +62,8 @@ export class AppComponent implements OnInit, OnDestroy {
     private translateService: TranslateService,
     private localStorageService: LocalStorageService,
     private librarySwitchService: LibrarySwitchService,
-    private router: Router
+    private router: Router,
+    private organisationService: OrganisationService
     ) {
       this.initializeEvents();
     }
@@ -101,21 +103,28 @@ export class AppComponent implements OnInit, OnDestroy {
         );
       }
       if (this.access) {
-        if (!this.localStorageService.has(User.STORAGE_KEY)) {
-          this.localStorageService.set(User.STORAGE_KEY, user);
-        } else {
-          const userLocal = this.localStorageService.get(User.STORAGE_KEY);
-          if (userLocal.pid !== user.pid) {
+        this.organisationService.loadOrganisationByPid(
+          user.library.organisation.pid
+        );
+        this.organisationService.onOrganisationLoaded.subscribe(() => {
+          if (!this.localStorageService.has(User.STORAGE_KEY)) {
             this.localStorageService.set(User.STORAGE_KEY, user);
+          } else {
+            const userLocal = this.localStorageService.get(User.STORAGE_KEY);
+            if (userLocal.pid !== user.pid) {
+              this.localStorageService.set(User.STORAGE_KEY, user);
+            }
+            const locale = this.localStorageService.get(User.STORAGE_KEY);
+            user.setCurrentLibrary(locale.currentLibrary);
           }
-          const locale = this.localStorageService.get(User.STORAGE_KEY);
-          user.setCurrentLibrary(locale.currentLibrary);
-        }
-        this.librarySwitchService.switch(
-          user.getCurrentLibrary()
-        );
+          this.librarySwitchService.switch(
+            user.getCurrentLibrary()
+          );
+          this.user = user;
+        });
+      } else {
+        this.user = user;
       }
-      this.user = user;
     }));
 
     this._subcription.add(this.router.events.pipe(

projects/admin/src/app/service/organisation.service.spec.ts

@@ -0,0 +1,33 @@
+/*
+ * RERO ILS UI
+ * Copyright (C) 2020 RERO
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import { TestBed } from '@angular/core/testing';
+
+import { OrganisationService } from './organisation.service';
+import { HttpClientModule } from '@angular/common/http';
+
+describe('OrganisationService', () => {
+  beforeEach(() => TestBed.configureTestingModule({
+    imports: [
+      HttpClientModule
+    ]
+  }));
+
+  it('should be created', () => {
+    const service: OrganisationService = TestBed.get(OrganisationService);
+    expect(service).toBeTruthy();
+  });
+});

projects/admin/src/app/service/organisation.service.ts

@@ -0,0 +1,71 @@
+/*
+ * RERO ILS UI
+ * Copyright (C) 2020 RERO
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import { Injectable } from '@angular/core';
+import { RecordService } from '@rero/ng-core';
+import { Subject } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class OrganisationService {
+
+  /**
+   * Observable on Record Organisation
+   */
+  private _onOrganisationLoaded: Subject<any> = new Subject();
+
+  /**
+   * Organisation record
+   */
+  private _record: any;
+
+  /**
+   * return observable of organisation
+   */
+  get onOrganisationLoaded() {
+    return this._onOrganisationLoaded.asObservable();
+  }
+
+  /**
+   * get current organisation
+   */
+  get organisation() {
+    return this._record;
+  }
+
+  /**
+   * Constructor
+   * @param recordService - RecordService
+   */
+  constructor(private _recordService: RecordService) { }
+
+  /**
+   * Load organisation record
+   * @param pid - string
+   */
+  loadOrganisationByPid(pid: string) {
+    this._recordService.getRecord('organisations', pid)
+    .pipe(
+      map((record: any) => this._record = record.metadata)
+    )
+    .subscribe((organisation: any) => {
+      this._record = organisation;
+      this._onOrganisationLoaded.next(organisation);
+    });
+  }
+}