From ea3a2076c708f2878ba19832e945c399a35e4057 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Wed, 21 Nov 2018 09:13:02 +0100
Subject: [PATCH] finished look of sidebar

---
 package.json                                  |  2 +-
 .../admin-sidebar/admin-sidebar.actions.ts    |  8 +++
 .../admin-sidebar.component.html              | 13 +++--
 .../admin-sidebar.component.scss              | 29 ++++++----
 .../admin-sidebar/admin-sidebar.component.ts  | 25 ++++++++-
 .../admin-sidebar/admin-sidebar.reducer.ts    | 10 ++++
 src/app/shared/animations/rotate.ts           |  4 ++
 src/app/shared/form/form.service.spec.ts      | 56 ++++++++++---------
 src/app/shared/host-window.service.spec.ts    | 12 ++--
 webpack.config.js                             |  3 +-
 10 files changed, 110 insertions(+), 52 deletions(-)

diff --git a/package.json b/package.json
index 72a1bb16cd..de6d2f23ef 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "prebuild:prod": "yarn run prebuild",
     "build": "webpack --progress --mode development",
     "build:aot": "webpack --env.aot --env.server --mode development && webpack --env.aot --env.client --mode development",
-    "build:prod": "webpack --env.aot --env.server --env.production && webpack --env.aot --env.client --env.production",
+    "build:prod": "webpack --env.aot --env.server --mode production && webpack --env.aot --env.client --mode production",
     "postbuild:prod": "yarn run rollup",
     "rollup": "rollup -c rollup.config.js",
     "prestart": "yarn run build:prod",
diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.actions.ts b/src/app/+admin/admin-sidebar/admin-sidebar.actions.ts
index f349b0010a..323f6879c4 100644
--- a/src/app/+admin/admin-sidebar/admin-sidebar.actions.ts
+++ b/src/app/+admin/admin-sidebar/admin-sidebar.actions.ts
@@ -12,6 +12,7 @@ import { type } from '../../shared/ngrx/type';
  */
 export const AdminSidebarActionTypes = {
   SECTION_COLLAPSE: type('dspace/admin-sidebar/SECTION_COLLAPSE'),
+  SECTION_COLLAPSE_ALL: type('dspace/admin-sidebar/SECTION_COLLAPSE_ALL'),
   SECTION_EXPAND: type('dspace/admin-sidebar/SECTION_EXPAND'),
   SECTION_TOGGLE: type('dspace/admin-sidebar/SECTION_TOGGLE'),
   COLLAPSE: type('dspace/admin-sidebar/COLLAPSE'),
@@ -73,6 +74,13 @@ export class AdminSidebarSectionCollapseAction extends AdminSidebarSectionAction
   type = AdminSidebarActionTypes.SECTION_COLLAPSE;
 }
 
+/**
+ * Used to collapse a section
+ */
+export class AdminSidebarSectionCollapseAllAction extends AdminSidebarAction {
+  type = AdminSidebarActionTypes.SECTION_COLLAPSE_ALL;
+}
+
 /**
  * Used to expand a section
  */
diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.html b/src/app/+admin/admin-sidebar/admin-sidebar.component.html
index b2d8d94a93..a76dd9781e 100644
--- a/src/app/+admin/admin-sidebar/admin-sidebar.component.html
+++ b/src/app/+admin/admin-sidebar/admin-sidebar.component.html
@@ -1,13 +1,16 @@
-<nav class="navbar navbar-dark bg-dark p-0" [ngClass]="{'active': (sidebarCollapsed | async)}"
+<nav class="navbar navbar-dark bg-dark p-0" [ngClass]="{'active': sidebarActive}"
      [@slideSidebar]="{
      value: ((sidebarCollapsed | async) ? 'collapsed' : 'expanded'),
      params: {sidebarWidth: (sidebarWidth | async)}
-    }">
+    }" (@slideSidebar.done)="finishSlide($event)">
+
     <div class="sidebar-top-level-items">
         <ul class="navbar-nav">
             <li class="admin-menu-header">
-                <a class="shortcuts-tree navbar-brand" href="#">
-                    <img class="admin-logo mr-2" src="assets/images/dspace-logo-mini.svg">
+                <a class="shortcuts-tree navbar-brand mr-0" href="#">
+                    <span class="logo-wrapper">
+                        <img class="admin-logo" src="assets/images/dspace-logo-mini.svg">
+                    </span>
                     <h4 class="section-header-text">Admin</h4>
                 </a>
             </li>
@@ -17,7 +20,7 @@
                     <i class="fas fa-plus-circle fa-fw"></i>
                     <span class="section-header-text">New</span>
                     <i class="fas fa-chevron-right fa-pull-right fa-xxs"
-                       [ngClass]="{'fa-rotate-90': (active('new') | async)}"></i>
+                       [@rotateInOut]="(active('new') | async) ? 'rotateOut': 'rotateIn'"></i>
                 </a>
                 <ul class="sidebar-sub-level-items" [ngbCollapse]="!(active('new') | async)">
                     <li><a class="nav-item nav-link" href="#">Community</a></li>
diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.scss b/src/app/+admin/admin-sidebar/admin-sidebar.component.scss
index 0b952314f6..b98caeb2de 100644
--- a/src/app/+admin/admin-sidebar/admin-sidebar.component.scss
+++ b/src/app/+admin/admin-sidebar/admin-sidebar.component.scss
@@ -16,9 +16,9 @@
                 overflow: auto;
             }
         }
-
-        .section-header-text {
-            display: inline;
+        .section-header-text, .fa-chevron-right {
+            display: none;
+            padding-left: $spacer/2;
         }
 
         .navbar-nav {
@@ -27,11 +27,9 @@
                 &.active {
                     background-color: $admin-sidebar-dark;
                 }
-                .fa-fw {
-                    text-align: left;
-                    width: 1.75em;
-                }
+
             }
+
             .sidebar-sub-level-items {
                 list-style: disc;
                 color: $navbar-dark-color;
@@ -42,16 +40,25 @@
             }
             .admin-menu-header {
                 background-color: $admin-sidebar-dark;
-                img {
-                    height: 1em;
-                    vertical-align: baseline;
+                .logo-wrapper {
+                    text-align: center;
+                    display: inline-block;
+                    width: 1.25em;
+                    img {
+                        height: 1em;
+                        vertical-align: text-bottom;
+                    }
                 }
+                .section-header-text {
+                    vertical-align: bottom;
+                }
+
             }
         }
 
         &.active {
             .section-header-text, .fa-chevron-right {
-                display: none;
+                display: inline;
             }
         }
     }
diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts b/src/app/+admin/admin-sidebar/admin-sidebar.component.ts
index 2317e612da..d310fcb5b9 100644
--- a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts
+++ b/src/app/+admin/admin-sidebar/admin-sidebar.component.ts
@@ -4,10 +4,15 @@ import { MemoizedSelector, select, Store } from '@ngrx/store';
 import { AdminSidebarSectionState, AdminSidebarState, } from './admin-sidebar.reducer';
 import { hasValue } from '../../shared/empty.util';
 import { map } from 'rxjs/operators';
-import { AdminSidebarSectionToggleAction, AdminSidebarToggleAction } from './admin-sidebar.actions';
+import {
+  AdminSidebarSectionCollapseAllAction,
+  AdminSidebarSectionToggleAction,
+  AdminSidebarToggleAction
+} from './admin-sidebar.actions';
 import { AppState, keySelector } from '../../app.reducer';
 import { slideSidebar } from '../../shared/animations/slide';
 import { CSSVariableService } from '../../shared/sass-helper/sass-helper.service';
+import { rotateInOut } from '../../shared/animations/rotate';
 
 const sidebarSectionStateSelector = (state: AppState) => state.adminSidebar.sections;
 const sidebarStateSelector = (state) => state.adminSidebar;
@@ -20,11 +25,12 @@ const sectionByNameSelector = (name: string): MemoizedSelector<AppState, AdminSi
   selector: 'ds-admin-sidebar',
   templateUrl: './admin-sidebar.component.html',
   styleUrls: ['./admin-sidebar.component.scss'],
-  animations: [slideSidebar]
+  animations: [slideSidebar, rotateInOut]
 })
 export class AdminSidebarComponent implements OnInit {
   sidebarCollapsed: Observable<boolean>;
   sidebarWidth: Observable<string>;
+  sidebarActive = true;
 
   constructor(private store: Store<AdminSidebarState>,
               private variableService: CSSVariableService) {
@@ -52,6 +58,21 @@ export class AdminSidebarComponent implements OnInit {
 
   toggle(event: Event) {
     event.preventDefault();
+    // Is sidebar closing?
+    if (this.sidebarActive) {
+      this.sidebarActive = false;
+      this.store.dispatch(new AdminSidebarSectionCollapseAllAction());
+    }
     this.store.dispatch(new AdminSidebarToggleAction());
   }
+
+  /**
+   * Method to change this.collapsed to false when the slide animation ends and is sliding open
+   * @param event The animation event
+   */
+  finishSlide(event: any): void {
+    if (event.fromState === 'collapsed') {
+      this.sidebarActive = true;
+    }
+  }
 }
diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.reducer.ts b/src/app/+admin/admin-sidebar/admin-sidebar.reducer.ts
index afec64421e..5e8b343996 100644
--- a/src/app/+admin/admin-sidebar/admin-sidebar.reducer.ts
+++ b/src/app/+admin/admin-sidebar/admin-sidebar.reducer.ts
@@ -59,6 +59,16 @@ export function adminSidebarReducer(state = initialState, action: AdminSidebarAc
           collapsed: !collapsed
         });
       }
+      case AdminSidebarActionTypes.SECTION_COLLAPSE_ALL: {
+        const newSectionState: AdminSidebarSectionState = Object.create(null);
+        if (hasValue(state.sections)) {
+          Object.keys(state.sections).forEach((section) =>
+            newSectionState[section] = {
+              sectionCollapsed: true
+            });
+        }
+        return Object.assign({}, state, { sections: newSectionState });
+      }
       default: {
         return state;
       }
diff --git a/src/app/shared/animations/rotate.ts b/src/app/shared/animations/rotate.ts
index 00f8b01452..1346833100 100644
--- a/src/app/shared/animations/rotate.ts
+++ b/src/app/shared/animations/rotate.ts
@@ -12,6 +12,10 @@ export const rotateLeave = transition('rotateIn => rotateOut', [
   animate('400ms ease-in-out')
 ]);
 
+
+export const rotate = state('rotate', style({opacity: 0, transform: 'rotate(90deg)'}));
+
+
 export const rotateIn = trigger('rotateIn', [
   rotateEnter
 ]);
diff --git a/src/app/shared/form/form.service.spec.ts b/src/app/shared/form/form.service.spec.ts
index 1c13039e3c..ee0c7fd368 100644
--- a/src/app/shared/form/form.service.spec.ts
+++ b/src/app/shared/form/form.service.spec.ts
@@ -2,7 +2,11 @@ import { Store, StoreModule } from '@ngrx/store';
 import { async, inject, TestBed } from '@angular/core/testing';
 import { AbstractControl, FormControl, FormGroup, Validators } from '@angular/forms';
 
-import { DynamicFormControlModel, DynamicInputModel } from '@ng-dynamic-forms/core';
+import {
+  DynamicFormControlModel,
+  DynamicFormGroupModel,
+  DynamicInputModel
+} from '@ng-dynamic-forms/core';
 
 import { FormService } from './form.service';
 import { FormBuilderService } from './builder/form-builder.service';
@@ -10,7 +14,7 @@ import { AppState } from '../../app.reducer';
 import { formReducer } from './form.reducer';
 import { getMockFormBuilderService } from '../mocks/mock-form-builder-service';
 
-describe('FormService test suite', () => {
+fdescribe('FormService test suite', () => {
   const config = {
     form: {
       validatorMap: {
@@ -37,30 +41,30 @@ describe('FormService test suite', () => {
     }),
     new DynamicInputModel({ id: 'date' }),
     new DynamicInputModel({ id: 'description' }),
-    // new DynamicFormGroupModel({
-    //
-    //   id: 'addressLocation',
-    //   group: [
-    //     new DynamicInputModel({
-    //
-    //       id: 'zipCode',
-    //       label: 'Zip Code',
-    //       placeholder: 'ZIP'
-    //     }),
-    //     new DynamicInputModel({
-    //
-    //       id: 'state',
-    //       label: 'State',
-    //       placeholder: 'State'
-    //     }),
-    //     new DynamicInputModel({
-    //
-    //       id: 'city',
-    //       label: 'City',
-    //       placeholder: 'City'
-    //     })
-    //   ]
-    // }),
+    new DynamicFormGroupModel({
+
+      id: 'addressLocation',
+      group: [
+        new DynamicInputModel({
+
+          id: 'zipCode',
+          label: 'Zip Code',
+          placeholder: 'ZIP'
+        }),
+        new DynamicInputModel({
+
+          id: 'state',
+          label: 'State',
+          placeholder: 'State'
+        }),
+        new DynamicInputModel({
+
+          id: 'city',
+          label: 'City',
+          placeholder: 'City'
+        })
+      ]
+    }),
   ];
 
   let controls;
diff --git a/src/app/shared/host-window.service.spec.ts b/src/app/shared/host-window.service.spec.ts
index b8c7e54ade..518059f305 100644
--- a/src/app/shared/host-window.service.spec.ts
+++ b/src/app/shared/host-window.service.spec.ts
@@ -19,7 +19,7 @@ describe('HostWindowService', () => {
     beforeEach(() => {
       const _initialState = { hostWindow: { width: 1600, height: 770 } };
       store = new Store<AppState>(observableOf(_initialState), undefined, undefined);
-      service = new HostWindowService(store);
+      service = new HostWindowService(store, null);
     });
 
     it('isXs() should return false with width = 1600', () => {
@@ -55,7 +55,7 @@ describe('HostWindowService', () => {
     beforeEach(() => {
       const _initialState = { hostWindow: { width: 1100, height: 770 } };
       store = new Store<AppState>(observableOf(_initialState), undefined, undefined);
-      service = new HostWindowService(store);
+      service = new HostWindowService(store, null);
     });
 
     it('isXs() should return false with width = 1100', () => {
@@ -91,7 +91,7 @@ describe('HostWindowService', () => {
     beforeEach(() => {
       const _initialState = { hostWindow: { width: 800, height: 770 } };
       store = new Store<AppState>(observableOf(_initialState), undefined, undefined);
-      service = new HostWindowService(store);
+      service = new HostWindowService(store, null);
     });
 
     it('isXs() should return false with width = 800', () => {
@@ -127,7 +127,7 @@ describe('HostWindowService', () => {
     beforeEach(() => {
       const _initialState = { hostWindow: { width: 600, height: 770 } };
       store = new Store<AppState>(observableOf(_initialState), undefined, undefined);
-      service = new HostWindowService(store);
+      service = new HostWindowService(store, null);
     });
 
     it('isXs() should return false with width = 600', () => {
@@ -163,7 +163,7 @@ describe('HostWindowService', () => {
     beforeEach(() => {
       const _initialState = { hostWindow: { width: 400, height: 770 } };
       store = new Store<AppState>(observableOf(_initialState), undefined, undefined);
-      service = new HostWindowService(store);
+      service = new HostWindowService(store, null);
     });
 
     it('isXs() should return true with width = 400', () => {
@@ -197,7 +197,7 @@ describe('HostWindowService', () => {
 
   describe('widthCategory', () => {
     beforeEach(() => {
-      service = new HostWindowService({} as Store<AppState>);
+      service = new HostWindowService({} as Store<AppState>, null);
     });
 
     it('should call getWithObs to get the current width', () => {
diff --git a/webpack.config.js b/webpack.config.js
index 8f02f3ce8a..f9c09134b6 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -27,7 +27,8 @@ module.exports = function(env, options) {
       getAotPlugin('client', !!env.aot)
     ]
   });
-  if (env.production) {
+  console.log(options.mode);
+  if (options.mode === 'production') {
     serverConfig = webpackMerge({}, serverConfig, prodPartial);
     clientConfig = webpackMerge({}, clientConfig, prodPartial);
   }