[NAE-2072] Workspaces

- change funcionality

Author: Kovy95

projects/netgrif-components-core/src/lib/navigation/navigation-double-drawer/abstract-navigation-double-drawer.ts

@@ -4,7 +4,7 @@ import {MatDrawerMode} from '@angular/material/sidenav';
 import {ActivatedRoute, Router} from '@angular/router';
 import {ResizeEvent} from 'angular-resizable-element';
 import {Observable, of, Subject, Subscription} from 'rxjs';
-import {map} from 'rxjs/operators';
+import {map, tap} from 'rxjs/operators';
 import {RoleAccess, View} from '../../../commons/schema';
 import {AccessService} from '../../authorization/permission/access.service';
 import {ConfigurationService} from '../../configuration/configuration.service';
@@ -43,6 +43,7 @@ import {
     RIGHT_SIDE_NEW_PAGE_SIZE,
     SETTINGS_TRANSITION_ID
 } from '../model/navigation-configs';
+import {Workspace} from "../../user/models/workspace";
 
 
 @Component({
@@ -117,7 +118,8 @@ export abstract class AbstractNavigationDoubleDrawerComponent implements OnInit,
     };
 
     protected _childCustomViews: { [uri: string]: { [key: string]: NavigationItem } };
-    public userWorkspaces$: Observable<Array<string>>;
+    public userWorkspaces$: Observable<Array<Workspace>>;
+    public userWorkspacesLength: number;
 
     protected constructor(protected _router: Router,
                           protected _activatedRoute: ActivatedRoute,
@@ -165,6 +167,10 @@ export abstract class AbstractNavigationDoubleDrawerComponent implements OnInit,
                 this.resolveHiddenMenuItemFromChildViews(viewConfigurationPath + '/' + key, childView);
             });
         }
+
+        this.userWorkspaces$ = this._userService.workspaces$.pipe(
+            tap(arr => this.userWorkspacesLength = arr.length)
+        );
     }
 
     get currentNode(): UriNodeResource {

projects/netgrif-components-core/src/lib/resources/engine-endpoint/user-resource.service.ts

@@ -78,7 +78,19 @@ export class UserResourceService extends AbstractResourceService {
      * **Request URL:** {{baseUrl}}/api/user/workspaces
      */
     public getAllWorkspaces(params?: Params): Observable<Array<Workspace>> {
-        return this._resourceProvider.get$('user/workspaces', this.SERVER_URL, params)
+        return this._resourceProvider.get$('users/workspaces', this.SERVER_URL, params)
+            .pipe(map(r => this.changeType(r, undefined)));
+    }
+
+    /**
+     * Get all workspaces
+     *
+     * **Request Type:** GET
+     *
+     * **Request URL:** {{baseUrl}}/api/user/workspaces
+     */
+    public changeWorkspace(workspaceId: string, params?: Params): Observable<UserResource> {
+        return this._resourceProvider.post$('users/workspace', this.SERVER_URL, {workspaceId}, params)
             .pipe(map(r => this.changeType(r, undefined)));
     }
 

projects/netgrif-components-core/src/lib/user/services/user.service.ts

@@ -26,7 +26,7 @@ export class UserService implements OnDestroy {
     protected _subAuth: Subscription;
     protected _subAnonym: Subscription;
     private _publicLoadCalled: boolean;
-    protected _workspaces: BehaviorSubject<Array<Workspace>>;
+    protected _workspaces: ReplaySubject<Array<Workspace>>;
 
     public readonly GLOBAL_ROLE_PREFIX = 'global_';
 
@@ -39,11 +39,14 @@ export class UserService implements OnDestroy {
         this._user = this.emptyUser();
         this._loginCalled = false;
         this._userChange$ = new ReplaySubject<User>(1);
+        this._workspaces = new ReplaySubject<Array<Workspace>>(1);
         this._anonymousUserChange$ = new ReplaySubject<User>(1);
         setTimeout(() => {
             this._subAuth = this._authService.authenticated$.subscribe(auth => {
                 if (auth && !this._loginCalled) {
                     this.loadUser();
+                } else if (auth && this._loginCalled) {
+                    this.loadWorkspaces();
                 } else if (!auth) {
                     this.clearUser();
                     this.publishUserChange();
@@ -68,10 +71,6 @@ export class UserService implements OnDestroy {
         return this._userChange$.asObservable();
     }
 
-    get workspaces() {
-        return this._workspaces.getValue();
-    }
-
     get workspaces$(): Observable<Array<Workspace>> {
         return this._workspaces.asObservable();
     }
@@ -232,7 +231,7 @@ export class UserService implements OnDestroy {
     }
 
     public changeWorkspace(workspaceId: string) {
-        this._userResource.updateUser(this.user.id, {workspaceId}).subscribe(user => {
+        this._userResource.changeWorkspace(workspaceId).subscribe(user => {
             if (user) {
                 const backendUser = {...user, id: user.id.toString()};
                 this._user = this._userTransform.transform(backendUser);

projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.html

@@ -115,13 +115,13 @@
     </div>
 
     <mat-menu #activeWorkspaceMenu="matMenu" overlapTrigger="false" xPosition="after" yPosition="above">
-        <button *ngFor='let workspace of userWorkspaces$ | async' mat-menu-item (click)="setWorkspace(workspace)"
-                [ngClass]="{'menu-button-selected': workspace === activeWorkspace()}">
-            {{ workspace }}
+        <button *ngFor='let workspace of userWorkspaces$ | async' mat-menu-item (click)="setWorkspace(workspace.id)"
+                [ngClass]="{'menu-button-selected': workspace.id === activeWorkspace()}">
+            {{ workspace.id + (workspace.defaultWorkspace ? " (D)" : "")}}
         </button>
     </mat-menu>
 
-    <button mat-icon-button
+    <button mat-icon-button *ngIf="userWorkspacesLength > 1"
             [matMenuTriggerFor]="activeWorkspaceMenu"
             class="menu-button mat-typography menu-font-color margin-top-default"
             [matTooltip]="'drawer.selectedGroup' | translate"

projects/netgrif-components/src/lib/navigation/navigation.theme.scss

@@ -19,6 +19,10 @@
         }
     }
 
+    .menu-button-selected {
+        olor: mat.get-color-from-palette($primary) !important;
+    }
+
     .rail-color {
         background: #F8FAFC;
     }