implementing usermanager settiings panel

backend/config/ConfigLoader.ts

@@ -25,7 +25,6 @@ export class ConfigLoader {
         let argv = optimist.argv;
         delete(argv._);
         delete(argv.$0);
-        console.log(argv);
         this.processHierarchyVar(configObject, argv);
     };
 

backend/middlewares/user/UserMWs.ts

@@ -3,6 +3,7 @@ import {Error, ErrorCodes} from "../../../common/entities/Error";
 import {ObjectManagerRepository} from "../../model/ObjectManagerRepository";
 import {User} from "../../../common/entities/User";
 import {Config} from "../../config/Config";
+import {Utils} from "../../../common/Utils";
 
 export class UserMWs {
 
@@ -91,6 +92,7 @@ export class UserMWs {
             if ((err) || (!result)) {
                 return next(new Error(ErrorCodes.GENERAL_ERROR));
             }
+            result = Utils.clone(result);
             for (let i = 0; i < result.length; i++) {
                 result[i].password = "";
             }

frontend/app/admin/admin.component.html

@@ -1,77 +1,5 @@
 <app-frame>
     <div body class="container">
-        <div class="panel panel-default" *ngIf="userManagementEnable">
+        <settings-usermanager *ngIf="userManagementEnable"></settings-usermanager>
-            <div class="panel-heading">
-                <h3 class="panel-title">User management</h3>
-            </div>
-            <div class="panel-body">
-
-                <table class="table table-hover">
-                    <thead>
-                    <tr>
-                        <th>Name</th>
-                        <th>Role</th>
-                        <th></th>
-                    </tr>
-                    </thead>
-                    <tr *ngFor="let user of users">
-                        <td>{{user.name}}</td>
-                        <td *ngIf="canModifyUser(user)">
-                            <select class="form-control" [(ngModel)]="user.role"  (ngModelChange)="updateRole(user)" required>
-                                <option *ngFor="let repository of userRoles" [value]="repository.key">
-                                    {{repository.value}}
-                                </option>
-                            </select>
-                        </td>
-                        <td *ngIf="!canModifyUser(user)">
-                            {{user.role | stringifyRole}}
-                        </td>
-                        <td>
-                            <button *ngIf="canModifyUser(user)" (click)="deleteUser(user)"
-                                    class="btn btn-danger pull-right">
-                                <span class="glyphicon glyphicon-trash" aria-hidden="true" aria-label="Delete"></span>
-                            </button>
-                        </td>
-                    </tr>
-                </table>
-
-                <button class="btn btn-default  pull-right" data-toggle="modal" data-target="#myModal"
-                        (click)="initNewUser()">+ Add
-                    user
-                </button>
-            </div>
-        </div>
-    </div>
-
-    <!-- Modal -->
-    <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-                            aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title" id="myModalLabel">Modal title</h4>
-                </div>
-                <form (ngSubmit)="onSubmit()" #NewUserForm="ngForm">
-                    <div class="modal-body">
-                        <input type="text" class="form-control" placeholder="Username" autofocus
-                               [(ngModel)]="newUser.name" ngControl="name" #name="ngForm" required>
-                        <input type="password" class="form-control" placeholder="Password"
-                               [(ngModel)]="newUser.password" ngControl="password" #name="ngForm" required>
-                        <select class="form-control" [(ngModel)]="newUser.role" required>
-                            <option *ngFor="let repository of userRoles" [value]="repository.key">{{repository.value}}
-                            </option>
-                        </select>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                        <button type="button" class="btn btn-primary" data-dismiss="modal"
-                                (click)="addNewUser()"
-                                [disabled]="!NewUserForm.form.valid">Add User
-                        </button>
-                    </div>
-                </form>
-            </div>
-        </div>
     </div>
 </app-frame>

frontend/app/admin/admin.component.ts

@@ -4,31 +4,23 @@ import {Component, OnInit} from "@angular/core";
 import {AuthenticationService} from "../model/network/authentication.service.ts";
 import {Router} from "@angular/router-deprecated";
 import {FrameComponent} from "../frame/frame.component";
-import {User, UserRoles} from "../../../common/entities/User";
+import {UserRoles} from "../../../common/entities/User";
 import {FORM_DIRECTIVES} from "@angular/common";
-import {Utils} from "../../../common/Utils";
-import {AdminService} from "./admin.service";
-import {Message} from "../../../common/entities/Message";
 import {StringifyRole} from "./../pipes/StringifyRolePipe";
 import {Config} from "../config/Config";
+import {UserMangerSettingsComponent} from "../settings/usermanager/usermanager.settings.component";
 
 @Component({
     selector: 'admin',
     templateUrl: 'app/admin/admin.component.html',
     styleUrls: ['app/admin/admin.component.css'],
-    directives: [FrameComponent, FORM_DIRECTIVES],
+    directives: [FrameComponent, FORM_DIRECTIVES, UserMangerSettingsComponent],
-    providers: [AdminService],
     pipes: [StringifyRole]
 })
 export class AdminComponent implements OnInit {
-
-    private newUser = new User();
-    private userRoles:Array<any> = [];
-    private users:Array<User> = [];
     userManagementEnable:boolean = false;
 
-    constructor(private _authService:AuthenticationService, private _router:Router, private _adminService:AdminService) {
+    constructor(private _authService:AuthenticationService, private _router:Router) {
-
         this.userManagementEnable = Config.Client.authenticationRequired;
     }
 
@@ -37,50 +29,8 @@ export class AdminComponent implements OnInit {
             this._router.navigate(['Login']);
             return;
         }
-        if (Config.Client.authenticationRequired === true) {
-            this.userRoles = Utils.enumToArray(UserRoles).filter(r => r.key <= this._authService.getUser().role);
-            this.getUsersList();
-        }
     }
 
-    private getUsersList() {
-        this._adminService.getUsers().then((result:Message<Array<User>>) => {
-            this.users = result.result;
-        });
-    }
-
-
-    canModifyUser(user:User):boolean {
-        let currentUser = this._authService.getUser();
-        if (!currentUser) {
-            return false;
-        }
-
-        return currentUser.name != user.name && currentUser.role >= user.role;
-    }
-
-    initNewUser() {
-        this.newUser = new User();
-        this.newUser.role = UserRoles.User;
-    }
-
-    addNewUser() {
-        this._adminService.createUser(this.newUser).then(() => {
-            this.getUsersList();
-        });
-    }
-
-    updateRole(user:User) {
-        this._adminService.updateRole(user).then(() => {
-            this.getUsersList();
-        });
-    }
-
-    deleteUser(user:User) {
-        this._adminService.deleteUser(user).then(() => {
-            this.getUsersList();
-        });
-    }
 }
 
 

frontend/app/gallery/grid/grid.gallery.component.ts

@@ -49,6 +49,7 @@ export class GalleryGridComponent implements OnChanges,AfterViewInit {
         if (this.isAfterViewInit === false) {
             return;
         }
+        this.updateContainerWidth();
         this.sortPhotos();
         this.mergeNewPhotos();
         setImmediate(() => {

frontend/app/gallery/grid/photo/photo.grid.gallery.component.ts

@@ -57,21 +57,16 @@ export class GalleryPhotoComponent implements IRenderable, OnInit, AfterViewInit
     }
 
     ngOnInit() {
+        this.loading.show = true;
         //set up befoar adding task to thumbnail generator
         if (this.gridPhoto.isThumbnailAvailable()) {
             this.image.src = this.gridPhoto.getThumbnailPath();
             this.image.show = true;
-            //  this.loading.show = false;
+        } else if (this.gridPhoto.isReplacementThumbnailAvailable()) {
-
+            this.image.src = this.gridPhoto.getReplacementThumbnailPath();
-        } else {
+            this.image.show = true;
-            if (this.gridPhoto.isReplacementThumbnailAvailable()) {
-                this.image.src = this.gridPhoto.getReplacementThumbnailPath();
-                this.image.show = true;
-                this.loading.show = false;
-            } else {
-                this.loading.show = true;
-            }
         }
+
     }
 
     ngAfterViewInit() {

frontend/app/login/login.component.html

@@ -2,6 +2,9 @@
     <div class="col-sm-offset-3  col-sm-6 col-lg-4 col-lg-offset-4">
     <form class="form-signin"  #LoginForm="ngForm">
         <h2 class="form-signin-heading">Please sign in</h2>
+        <div *ngIf="loginError">
+            {{loginError}}
+        </div>
         <input type="text" class="form-control" placeholder="Username"  autofocus
                [(ngModel)]="loginCredential.username"  ngControl="name"  #name="ngForm" required>
         <input type="password"  class="form-control" placeholder="Password"

frontend/app/login/login.component.ts

@@ -5,6 +5,9 @@ import {LoginCredential} from "../../../common/entities/LoginCredential";
 import {AuthenticationService} from "../model/network/authentication.service.ts";
 import {Router} from "@angular/router-deprecated";
 import {FORM_DIRECTIVES} from "@angular/common";
+import {Message} from "../../../common/entities/Message";
+import {User} from "../../../common/entities/User";
+import {ErrorCodes} from "../../../common/entities/Error";
 
 @Component({
     selector: 'login',
@@ -14,6 +17,7 @@ import {FORM_DIRECTIVES} from "@angular/common";
 })
 export class LoginComponent implements OnInit {
     loginCredential:LoginCredential;
+    loginError = null;
 
     constructor(private _authService:AuthenticationService, private _router:Router) {
         this.loginCredential = new LoginCredential();
@@ -26,7 +30,14 @@ export class LoginComponent implements OnInit {
     }
 
     onLogin() {
-        this._authService.login(this.loginCredential);
+        this.loginError = null;
+        this._authService.login(this.loginCredential).then((message:Message<User>) => {
+            if (message.error) {
+                if (message.error.code === ErrorCodes.CREDENTIAL_NOT_FOUND) {
+                    this.loginError = "Wrong username or password";
+                }
+            }
+        });
     }
 }
 

frontend/app/model/network/authentication.service.ts

@@ -26,7 +26,6 @@ export class AuthenticationService {
         //picking up session..
         if (this.isAuthenticated() == false && Cookie.get('pigallery2-session') != null) {
             if (typeof ServerInject !== "undefined" && typeof ServerInject.user !== "undefined") {
-                console.log("user found");
                 this.setUser(ServerInject.user);
             }
             this.getSessionUser();
@@ -51,12 +50,13 @@ export class AuthenticationService {
     }
 
     public login(credential:LoginCredential) {
-        this._userService.login(credential).then((message:Message<User>) => {
+        return this._userService.login(credential).then((message:Message<User>) => {
             if (message.error) {
                 console.log(ErrorCodes[message.error.code] + ", message: " + message.error.message);
             } else {
                 this.setUser(message.result);
             }
+            return message;
         });
     }
 

frontend/app/notification.service.ts

@@ -0,0 +1,29 @@
+///<reference path="../browser.d.ts"/>
+
+import {Injectable} from "@angular/core";
+
+@Injectable()
+export class NotificationService {
+
+
+    constructor() {
+
+    }
+
+    public showException(message:string) {
+
+    }
+
+    public showError(message:string) {
+
+    }
+
+    public showWarn(message:string) {
+
+    }
+
+    public showInfo(message:string) {
+
+    }
+
+}

frontend/app/settings/usermanager/usermanager.settings.component.html

@@ -0,0 +1,73 @@
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <h3 class="panel-title">User management</h3>
+    </div>
+    <div class="panel-body">
+
+        <table class="table table-hover">
+            <thead>
+            <tr>
+                <th>Name</th>
+                <th>Role</th>
+                <th></th>
+            </tr>
+            </thead>
+            <tr *ngFor="let user of users">
+                <td>{{user.name}}</td>
+                <td *ngIf="canModifyUser(user)">
+                    <select class="form-control" [(ngModel)]="user.role" (ngModelChange)="updateRole(user)" required>
+                        <option *ngFor="let repository of userRoles" [value]="repository.key">
+                            {{repository.value}}
+                        </option>
+                    </select>
+                </td>
+                <td *ngIf="!canModifyUser(user)">
+                    {{user.role | stringifyRole}}
+                </td>
+                <td>
+                    <button *ngIf="canModifyUser(user)" (click)="deleteUser(user)"
+                            class="btn btn-danger pull-right">
+                        <span class="glyphicon glyphicon-trash" aria-hidden="true" aria-label="Delete"></span>
+                    </button>
+                </td>
+            </tr>
+        </table>
+
+        <button class="btn btn-default  pull-right" data-toggle="modal" data-target="#myModal"
+                (click)="initNewUser()">+ Add
+            user
+        </button>
+    </div>
+</div>
+
+<!-- Modal -->
+<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+                        aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" id="myModalLabel">Modal title</h4>
+            </div>
+            <form (ngSubmit)="onSubmit()" #NewUserForm="ngForm">
+                <div class="modal-body">
+                    <input type="text" class="form-control" placeholder="Username" autofocus
+                           [(ngModel)]="newUser.name" ngControl="name" #name="ngForm" required>
+                    <input type="password" class="form-control" placeholder="Password"
+                           [(ngModel)]="newUser.password" ngControl="password" #name="ngForm" required>
+                    <select class="form-control" [(ngModel)]="newUser.role" required>
+                        <option *ngFor="let repository of userRoles" [value]="repository.key">{{repository.value}}
+                        </option>
+                    </select>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                    <button type="button" class="btn btn-primary" data-dismiss="modal"
+                            (click)="addNewUser()"
+                            [disabled]="!NewUserForm.form.valid">Add User
+                    </button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>

frontend/app/settings/usermanager/usermanager.settings.component.ts

@@ -0,0 +1,81 @@
+///<reference path="../../../browser.d.ts"/>
+
+import {Component, OnInit} from "@angular/core";
+import {AuthenticationService} from "../../model/network/authentication.service.ts";
+import {Router} from "@angular/router-deprecated";
+import {FrameComponent} from "../../frame/frame.component";
+import {User, UserRoles} from "../../../../common/entities/User";
+import {FORM_DIRECTIVES} from "@angular/common";
+import {Utils} from "../../../../common/Utils";
+import {Message} from "../../../../common/entities/Message";
+import {StringifyRole} from "./../../pipes/StringifyRolePipe";
+import {UserManagerSettingsService} from "./usermanager.settings.service";
+
+@Component({
+    selector: 'settings-usermanager',
+    templateUrl: 'app/settings/usermanager/usermanager.settings.component.html',
+    styleUrls: ['app/settings/usermanager/usermanager.settings.component.css'],
+    directives: [FrameComponent, FORM_DIRECTIVES],
+    providers: [UserManagerSettingsService],
+    pipes: [StringifyRole]
+})
+export class UserMangerSettingsComponent implements OnInit {
+
+    private newUser = new User();
+    private userRoles:Array<any> = [];
+    private users:Array<User> = [];
+
+    constructor(private _authService:AuthenticationService, private _router:Router, private _userSettings:UserManagerSettingsService) {
+    }
+
+    ngOnInit() {
+        if (!this._authService.isAuthenticated() || this._authService.getUser().role < UserRoles.Admin) {
+            this._router.navigate(['Login']);
+            return;
+        }
+        this.userRoles = Utils.enumToArray(UserRoles).filter(r => r.key <= this._authService.getUser().role);
+        this.getUsersList();
+    }
+
+    private getUsersList() {
+        this._userSettings.getUsers().then((result:Message<Array<User>>) => {
+            this.users = result.result;
+        });
+    }
+
+
+    canModifyUser(user:User):boolean {
+        let currentUser = this._authService.getUser();
+        if (!currentUser) {
+            return false;
+        }
+
+        return currentUser.name != user.name && currentUser.role >= user.role;
+    }
+
+    initNewUser() {
+        this.newUser = new User();
+        this.newUser.role = UserRoles.User;
+    }
+
+    addNewUser() {
+        this._userSettings.createUser(this.newUser).then(() => {
+            this.getUsersList();
+        });
+    }
+
+    updateRole(user:User) {
+        this._userSettings.updateRole(user).then(() => {
+            this.getUsersList();
+        });
+    }
+
+    deleteUser(user:User) {
+        this._userSettings.deleteUser(user).then(() => {
+            this.getUsersList();
+        });
+    }
+}
+
+
+

frontend/app/settings/usermanager/usermanager.settings.service.spec.ts

@@ -3,8 +3,8 @@ import {BaseRequestOptions, Http} from "@angular/http";
 import {MockBackend} from "@angular/http/testing";
 import {provide} from "@angular/core";
 import "rxjs/Rx";
-import {NetworkService} from "../model/network/network.service";
+import {NetworkService} from "../../model/network/network.service";
-import {AdminService} from "./admin.service";
+import {UserManagerSettingsService} from "./usermanager.settings.service";
 
 
 describe('AdminService', () => {
@@ -19,7 +19,7 @@ describe('AdminService', () => {
             }, deps: [MockBackend, BaseRequestOptions]
         }),
         NetworkService,
-        AdminService
+        UserManagerSettingsService
     ]);
 
 

frontend/app/settings/usermanager/usermanager.settings.service.ts

@@ -1,12 +1,12 @@
-///<reference path="../../browser.d.ts"/>
+///<reference path="../../../browser.d.ts"/>
 
 import {Injectable} from "@angular/core";
-import {NetworkService} from "../model/network/network.service.ts";
+import {User} from "../../../../common/entities/User";
-import {Message} from "../../../common/entities/Message";
+import {NetworkService} from "../../model/network/network.service";
-import {User} from "../../../common/entities/User";
+import {Message} from "../../../../common/entities/Message";
 
 @Injectable()
-export class AdminService {
+export class UserManagerSettingsService {
 
 
     constructor(private _networkService:NetworkService) {