From 1cee41800a43dc27456baec16db74647f350b4aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Troels=20Beck=20Kr=C3=B8gh?= <tbk@netcompany.com>
Date: Wed, 23 Sep 2020 12:32:29 +0200
Subject: [PATCH 1/2] IOT-466: Dropdown to select organisation

---
 .../permission-row.component.html             |  2 +-
 src/app/app.module.ts                         |  5 +-
 src/app/auth/auth.service.ts                  | 15 ++-
 src/app/models/application.ts                 | 26 ++++--
 .../list-applications.component.ts            | 30 ++++--
 src/app/navbar/navbar.component.html          | 10 +-
 src/app/navbar/navbar.component.ts            | 92 +++++++++++++------
 src/app/navbar/navbar.module.ts               | 12 +--
 .../shared-variable/shared-variable.module.ts | 12 +++
 .../shared-variable.service.ts                | 36 ++++++++
 .../form-body-application.component.ts        | 19 ++--
 .../shared/services/application.service.ts    | 13 ++-
 12 files changed, 208 insertions(+), 64 deletions(-)
 create mode 100644 src/app/shared-variable/shared-variable.module.ts
 create mode 100644 src/app/shared-variable/shared-variable.service.ts

diff --git a/src/app/admin/permission/permission-list/permission-tabel/permission-row/permission-row.component.html b/src/app/admin/permission/permission-list/permission-tabel/permission-row/permission-row.component.html
index bac8a107..22d099f1 100644
--- a/src/app/admin/permission/permission-list/permission-tabel/permission-row/permission-row.component.html
+++ b/src/app/admin/permission/permission-list/permission-tabel/permission-row/permission-row.component.html
@@ -24,7 +24,7 @@
     <ul class="dropdown-menu" attr.aria-labelledby="tableRowDropdown-{{permission.id}}">
       <li class="dropdown-item">
         <a [routerLink]="[permission.id, 'edit-permission']"
-          routerLinkActive="active">{{ 'PERMISSION.TABLE-ROW.EDIT' | translate }}
+          routerLinkActive="active">{{ 'USERS.TABLE-ROW.EDIT' | translate }}
         </a>
       </li>
       <li class="dropdown-item">
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 2b729962..21314126 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -5,6 +5,7 @@ import { TranslateHttpLoader } from '@ngx-translate/http-loader';
 import { HttpClient, HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
+import { DashboardModule } from './views/dashboard/dashboard.module';
 import { NavbarModule } from './navbar/navbar.module';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { ReactiveFormsModule } from '@angular/forms';
@@ -14,7 +15,8 @@ import { DatatargetModule } from './views/datatarget/datatarget.module';
 import { ProfilesModule } from './profiles/profiles.module';
 import { AuthJwtInterceptor } from '@shared/helpers/auth-jwt.interceptor';
 import { AuthModule } from './auth/auth.module';
-import { DashboardModule } from './dashboard/dashboard.module';
+import { GlobalErrorHandler } from '@shared/helpers/global-error-handler';
+import { SharedVariableModule } from './shared-variable/shared-variable.module';
 
 export function HttpLoaderFactory(http: HttpClient) {
     return new TranslateHttpLoader(http, './assets/i18n/', '.json');
@@ -23,6 +25,7 @@ export function HttpLoaderFactory(http: HttpClient) {
 @NgModule({
     declarations: [AppComponent],
     imports: [
+        SharedVariableModule.forRoot(),
         AuthModule,
         BrowserModule,
         BrowserAnimationsModule,
diff --git a/src/app/auth/auth.service.ts b/src/app/auth/auth.service.ts
index c8fcfd17..ced3a181 100644
--- a/src/app/auth/auth.service.ts
+++ b/src/app/auth/auth.service.ts
@@ -5,11 +5,20 @@ import { environment } from '@environments/environment';
 import * as jwtDecode from 'jwt-decode';
 import * as moment from 'moment';
 import { of } from 'rxjs/internal/observable/of';
+import { RestService } from '@shared/services/rest.service';
+import { Observable } from 'rxjs';
+import { Organisation } from '@app/admin/organisation/organisation.model';
+import { UserResponse } from '../admin/users/user.model';
 
 export interface AuthResponseData {
   accessToken: string;
 }
 
+export interface CurrentUserInfoResponse {
+  user: UserResponse;
+  organizations: Organisation[];
+}
+
 @Injectable({
   providedIn: 'root',
 })
@@ -17,7 +26,7 @@ export class AuthService {
   private baseUrl = environment.baseUrl;
   private URL = 'auth/login';
 
-  constructor(private http: HttpClient) {}
+  constructor(private http: HttpClient, private restService: RestService) {}
 
   // global-admin@os2iot.dk
   // hunter2
@@ -36,6 +45,10 @@ export class AuthService {
       );
   }
 
+  me(): Observable<CurrentUserInfoResponse> {
+    return this.restService.get('auth/me');
+  }
+
   private setSession(jwt: string) {
     localStorage.setItem('id_token', jwt);
   }
diff --git a/src/app/models/application.ts b/src/app/models/application.ts
index ac0de36e..7d7f0e36 100644
--- a/src/app/models/application.ts
+++ b/src/app/models/application.ts
@@ -1,16 +1,24 @@
 import { IotDevice } from '../my-applications/iot-devices/iot-device.model';
+import { Organisation } from '../admin/organisation/organisation.model';
 
 export class Application {
-    public id: number;
-    public createdAt: string;
-    public updatedAt: string;
-    public name: string;
-    public description: string;
-    public iotDevices?: IotDevice[];
+  public id: number;
+  public createdAt: string;
+  public updatedAt: string;
+  public name: string;
+  public description: string;
+  public iotDevices?: IotDevice[];
+  public belongsTo: Organisation;
+}
+
+export class ApplicationRequest {
+  public name: string;
+  public description: string;
+  public organizationId: number;
 }
 
 export interface ApplicationData {
-    data: Application[];
-    ok?: boolean;
-    count?: number;
+  data: Application[];
+  ok?: boolean;
+  count?: number;
 }
diff --git a/src/app/my-applications/list-applications/list-applications.component.ts b/src/app/my-applications/list-applications/list-applications.component.ts
index a548eca1..5832cd0c 100644
--- a/src/app/my-applications/list-applications/list-applications.component.ts
+++ b/src/app/my-applications/list-applications/list-applications.component.ts
@@ -1,11 +1,20 @@
-import { Component, OnInit, OnChanges, SimpleChanges, OnDestroy } from '@angular/core';
+import {
+  Component,
+  OnInit,
+  OnChanges,
+  SimpleChanges,
+  OnDestroy,
+} from '@angular/core';
 import { Application } from '@app/models/application';
 import { TranslateService } from '@ngx-translate/core';
 import { ApplicationService } from '@shared/services/application.service';
 import { Subscription } from 'rxjs';
 import { Sort } from 'src/app/models/sort';
+import { NavbarComponent } from '../../navbar/navbar.component';
+import { SharedVariableService } from '../../shared-variable/shared-variable.service';
 
 @Component({
+  providers: [NavbarComponent],
   selector: 'app-list-applications',
   templateUrl: './list-applications.component.html',
   styleUrls: ['./list-applications.component.scss'],
@@ -65,18 +74,21 @@ export class ListApplicationsComponent implements OnInit, OnChanges, OnDestroy {
 
   constructor(
     public translate: TranslateService,
-    private applicationService: ApplicationService
+    private applicationService: ApplicationService,
+    private globalService: SharedVariableService
   ) {
     translate.use('da');
   }
-  
+
   ngOnChanges(changes: SimpleChanges): void {
     this.getApplications();
   }
 
   ngOnInit(): void {
     this.getApplications();
-
+    this.globalService.getValue().subscribe((organisationId) => {
+      this.getApplications(organisationId);
+    });
   }
 
   ngOnDestroy() {
@@ -107,7 +119,6 @@ export class ListApplicationsComponent implements OnInit, OnChanges, OnDestroy {
   }
 
   nextPage() {
-    console.log("got next outer")
     if (this.pageOffset < this.pageTotal) {
       this.pageOffset++;
     }
@@ -122,13 +133,18 @@ export class ListApplicationsComponent implements OnInit, OnChanges, OnDestroy {
     });
   }
 
-  getApplications(): void {
+  getCurrentOrganisationId(): number {
+    return this.globalService.getSelectedOrganisationId();
+  }
+
+  getApplications(orgId?: number): void {
     this.applicationsSubscription = this.applicationService
       .getApplications(
         this.pageLimit,
         this.pageOffset * this.pageLimit,
         this.selectedSortObject.dir,
-        this.selectedSortObject.col
+        this.selectedSortObject.col,
+        orgId ? orgId : this.getCurrentOrganisationId()
       )
       .subscribe((applications) => {
         this.applications = applications.data;
diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html
index e1ae9bed..95f54fb4 100644
--- a/src/app/navbar/navbar.component.html
+++ b/src/app/navbar/navbar.component.html
@@ -24,9 +24,13 @@
           <app-global-admin></app-global-admin>
         </li>
         <li class="nav-item py-2">
-          <a>
-            Skanderborg Kommune
-          </a>
+          <!-- <label class="form-label" for="name">{{'QUESTION.CHOOSE-PERMISSION-TYPE' | translate}}</label>* -->
+          <select id="organisation" name="organisation" class="form-select" required #orgSelect
+            (change)="onChange(orgSelect.value)">
+            <option *ngFor="let org of organisations" [value]="org.id"
+              [selected]="org.id === getSelectedOrganisation()">
+              {{org.name}}</option>
+          </select>
         </li>
         <li class="nav-item py-2">
           <ul class="navbar-nav flex-column">
diff --git a/src/app/navbar/navbar.component.ts b/src/app/navbar/navbar.component.ts
index 951746ac..75598e08 100644
--- a/src/app/navbar/navbar.component.ts
+++ b/src/app/navbar/navbar.component.ts
@@ -1,36 +1,74 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 
 import { TranslateService } from '@ngx-translate/core';
 import { faBroadcastTower } from '@fortawesome/free-solid-svg-icons';
 import { AuthService } from '@app/auth/auth.service';
 import { Router } from '@angular/router';
-import { User } from '@shared/form/form-body-application/form-body-application.component';
+import { Organisation } from '@app/admin/organisation/organisation.model';
+import { UserResponse } from '@app/admin/users/user.model';
+import { SharedVariableService } from '@app/shared-variable/shared-variable.service';
 
 @Component({
-    selector: 'app-navbar',
-    templateUrl: './navbar.component.html',
-    styleUrls: ['./navbar.component.scss'],
+  selector: 'app-navbar',
+  templateUrl: './navbar.component.html',
+  styleUrls: ['./navbar.component.scss'],
 })
-export class NavbarComponent {
-    public user: User;
-    isLoginMode = true;
-    faBroadcastTower = faBroadcastTower;
-
-
-    constructor(
-        private authService: AuthService,
-        public translate: TranslateService,
-        private router: Router,
-    ) {
-        translate.use('da');
-    }
-
-    onLogout() {
-        this.authService.logout();
-        this.router.navigateByUrl('auth');
-    }
-
-    isLoggedIn() {
-        return this.authService.isLoggedIn()
-    }
+export class NavbarComponent implements OnInit {
+  public user: UserResponse;
+  public organisations: Organisation[];
+
+  isLoginMode = true;
+  faBroadcastTower = faBroadcastTower;
+
+  constructor(
+    private authService: AuthService,
+    public translate: TranslateService,
+    private router: Router,
+    private sharedVariableServioce: SharedVariableService
+  ) {
+    translate.use('da');
+  }
+
+  ngOnInit(): void {
+    this.getAllowedOrganizations();
+  }
+
+  onLogout() {
+    this.authService.logout();
+    this.router.navigateByUrl('auth');
+  }
+
+  isLoggedIn() {
+    return this.authService.isLoggedIn();
+  }
+
+  getAllowedOrganizations() {
+    this.authService.me().subscribe((response) => {
+      this.organisations = response.organizations;
+      this.user = response.user;
+      this.sharedVariableServioce.getSelectedOrganisationId();
+      if (
+        (this.sharedVariableServioce.getSelectedOrganisationId() == 0 &&
+          response.organizations.length > 0) ||
+        !response.organizations.some(
+          (x) => x.id == this.sharedVariableServioce.getSelectedOrganisationId()
+        )
+      ) {
+        this.setSelectedOrganisation(response.organizations[0].id);
+      }
+    });
+  }
+
+  setSelectedOrganisation(value) {
+    this.sharedVariableServioce.setSelectedOrganisationId(value);
+  }
+
+  getSelectedOrganisation() {
+    return this.sharedVariableServioce.getSelectedOrganisationId();
+  }
+
+  public onChange(value) {
+    this.setSelectedOrganisation(value);
+    this.sharedVariableServioce.setValue(value);
+  }
 }
diff --git a/src/app/navbar/navbar.module.ts b/src/app/navbar/navbar.module.ts
index 08f034e7..7c895275 100644
--- a/src/app/navbar/navbar.module.ts
+++ b/src/app/navbar/navbar.module.ts
@@ -23,13 +23,9 @@ import { NGMaterialModule } from '@shared/Modules/materiale.module';
     RouterModule,
     TranslateModule,
     FontAwesomeModule,
-    NGMaterialModule
+    NGMaterialModule,
   ],
-  exports: [
-    NavbarComponent,
-  ],
-  providers: [
-    RestService,
-  ]
+  exports: [NavbarComponent],
+  providers: [RestService, NavbarComponent],
 })
-export class NavbarModule { }
+export class NavbarModule {}
diff --git a/src/app/shared-variable/shared-variable.module.ts b/src/app/shared-variable/shared-variable.module.ts
new file mode 100644
index 00000000..e90d2f06
--- /dev/null
+++ b/src/app/shared-variable/shared-variable.module.ts
@@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core';
+import { SharedVariableService } from '@app/shared-variable/shared-variable.service';
+
+@NgModule({})
+export class SharedVariableModule {
+  static forRoot() {
+    return {
+      ngModule: SharedVariableModule,
+      providers: [SharedVariableService],
+    };
+  }
+}
diff --git a/src/app/shared-variable/shared-variable.service.ts b/src/app/shared-variable/shared-variable.service.ts
new file mode 100644
index 00000000..18f4fde0
--- /dev/null
+++ b/src/app/shared-variable/shared-variable.service.ts
@@ -0,0 +1,36 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject, Observable } from 'rxjs';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class SharedVariableService {
+  constructor() {
+    this.routerInfo = new BehaviorSubject<number>(0);
+  }
+
+  private selectedOrganisationId: number;
+  private routerInfo: BehaviorSubject<number>;
+
+  getValue(): Observable<number> {
+    return this.routerInfo.asObservable();
+  }
+
+  setValue(newValue: number): void {
+    this.setSelectedOrganisationId(newValue);
+    this.routerInfo.next(newValue);
+  }
+
+  setSelectedOrganisationId(value: number) {
+    localStorage.setItem('selected_organisation', value.toString());
+    this.selectedOrganisationId = value;
+  }
+
+  getSelectedOrganisationId() {
+    if (this.selectedOrganisationId != null) {
+      return this.selectedOrganisationId;
+    }
+
+    return +localStorage.getItem('selected_organisation');
+  }
+}
diff --git a/src/app/shared/form/form-body-application/form-body-application.component.ts b/src/app/shared/form/form-body-application/form-body-application.component.ts
index 0d954c04..a2c80cba 100644
--- a/src/app/shared/form/form-body-application/form-body-application.component.ts
+++ b/src/app/shared/form/form-body-application/form-body-application.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, Input, OnDestroy, ErrorHandler } from '@angular/core';
+import { Component, OnInit, Input, OnDestroy } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Subscription } from 'rxjs';
 
@@ -6,9 +6,11 @@ import { TranslateService } from '@ngx-translate/core';
 
 import { RestService } from '../../services/rest.service';
 
-import { Application } from 'src/app/models/application';
+import { Application, ApplicationRequest } from 'src/app/models/application';
 import { ApplicationService } from '../../services/application.service';
-import { HttpErrorResponse, HttpDownloadProgressEvent } from '@angular/common/http';
+import { HttpErrorResponse } from '@angular/common/http';
+import { SharedVariableService } from '@app/shared-variable/shared-variable.service';
+
 
 export class User {
     public name: string;
@@ -32,7 +34,7 @@ export class FormBodyApplicationComponent implements OnInit, OnDestroy {
     public formFailedSubmit: boolean = false;
     private id: number;
 
-    application = new Application();
+    application = new ApplicationRequest();
     model = new User();
 
     constructor(
@@ -40,7 +42,8 @@ export class FormBodyApplicationComponent implements OnInit, OnDestroy {
         private applicationService: ApplicationService,
         private route: ActivatedRoute,
         public translate: TranslateService,
-        private router: Router
+        private router: Router,
+        private sharedVariableService: SharedVariableService
     ) { }
 
     ngOnInit(): void {
@@ -55,11 +58,15 @@ export class FormBodyApplicationComponent implements OnInit, OnDestroy {
         this.applicationsSubscription = this.restService
             .get('application', {}, id)
             .subscribe((application: Application) => {
-                this.application = application;
+                this.application = new ApplicationRequest();
+                this.application.name = application.name;
+                this.application.description = application.description;
+                this.application.organizationId = application.belongsTo.id;
             });
     }
 
     onSubmit(): void {
+        this.application.organizationId = this.sharedVariableService.getSelectedOrganisationId()
         if (this.id) {
             this.updateApplication(this.id);
         } else {
diff --git a/src/app/shared/services/application.service.ts b/src/app/shared/services/application.service.ts
index bebfaa6a..79293e91 100644
--- a/src/app/shared/services/application.service.ts
+++ b/src/app/shared/services/application.service.ts
@@ -4,6 +4,15 @@ import { RestService } from './rest.service';
 import { Observable } from 'rxjs';
 import { SortDir, SortCol } from 'src/app/models/sort';
 
+
+interface GetApplicationParameters {
+    limit: number;
+    offset: number;
+    sort: SortDir;
+    orderOn: SortCol;
+    organizationId?: number;
+}
+
 @Injectable({
     providedIn: 'root',
 })
@@ -11,6 +20,7 @@ export class ApplicationService {
     constructor(private restService: RestService) { }
 
     createApplication(body: any): Observable<ApplicationData> {
+        
         return this.restService.post('application', body, { observe: 'response' });
     }
 
@@ -29,12 +39,13 @@ export class ApplicationService {
         orderOn: SortCol,
         organizationId?: number
     ): Observable<ApplicationData> {
-        const body = {
+        const body: GetApplicationParameters = {
             limit: limit,
             offset: offset,
             sort: sort,
             orderOn: orderOn,
         };
+        body.organizationId = organizationId
         return this.restService.get('application', body);
     }
 

From d2cfa946f408f7d305553c403c3c4d92360c6d43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Troels=20Beck=20Kr=C3=B8gh?= <tbk@netcompany.com>
Date: Wed, 23 Sep 2020 12:36:56 +0200
Subject: [PATCH 2/2] Fix import

---
 src/app/app.module.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 21314126..57baecb4 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -5,7 +5,6 @@ import { TranslateHttpLoader } from '@ngx-translate/http-loader';
 import { HttpClient, HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
-import { DashboardModule } from './views/dashboard/dashboard.module';
 import { NavbarModule } from './navbar/navbar.module';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { ReactiveFormsModule } from '@angular/forms';
@@ -17,6 +16,7 @@ import { AuthJwtInterceptor } from '@shared/helpers/auth-jwt.interceptor';
 import { AuthModule } from './auth/auth.module';
 import { GlobalErrorHandler } from '@shared/helpers/global-error-handler';
 import { SharedVariableModule } from './shared-variable/shared-variable.module';
+import { DashboardModule } from './dashboard/dashboard.module';
 
 export function HttpLoaderFactory(http: HttpClient) {
     return new TranslateHttpLoader(http, './assets/i18n/', '.json');