From 73af76d29f7c2519c28b083432fa177008873167 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charles-=C3=89ric?= <charlesericbourget@gmail.com>
Date: Wed, 15 Feb 2017 13:23:37 -0500
Subject: [PATCH] feat(group results): Group results by source in a collapsible
 component (#98)

* feat(group results): Group results by source in a collapsible component
---
 .../pages/navigator/navigator.component.html  |  6 +--
 .../pages/navigator/navigator.component.styl  |  2 +-
 .../search-bar/search-bar.component.styl      |  2 +-
 .../search-result-details.component.html      |  2 +-
 .../search-result-details.component.spec.ts   |  3 +-
 .../search-result.component.html              |  2 +-
 .../search-result.component.spec.ts           |  3 +-
 .../search-tool/search-tool.component.html    | 26 ++++++++-----
 .../search-tool/search-tool.component.ts      | 29 +++++++-------
 src/app/search/sources/search-source-msp.ts   |  2 +-
 .../collapsible/collapsible.component.html    | 24 ++++++++++++
 .../collapsible/collapsible.component.spec.ts | 36 ++++++++++++++++++
 .../collapsible/collapsible.component.styl    | 38 +++++++++++++++++++
 .../collapsible/collapsible.component.ts      | 27 +++++++++++++
 src/app/shared/flex/flex.component.html       |  2 +-
 src/app/shared/flex/flex.component.styl       |  9 ++++-
 src/app/shared/list/list.component.ts         |  3 +-
 src/app/shared/panel/panel.component.html     |  6 +--
 src/app/shared/panel/panel.component.styl     |  2 +-
 src/app/shared/shared.module.ts               |  3 ++
 src/css/styles.styl                           |  4 +-
 src/css/theme.styl                            |  5 ++-
 22 files changed, 193 insertions(+), 43 deletions(-)
 create mode 100644 src/app/shared/collapsible/collapsible.component.html
 create mode 100644 src/app/shared/collapsible/collapsible.component.spec.ts
 create mode 100644 src/app/shared/collapsible/collapsible.component.styl
 create mode 100644 src/app/shared/collapsible/collapsible.component.ts

diff --git a/src/app/pages/navigator/navigator.component.html b/src/app/pages/navigator/navigator.component.html
index 841ba1311..f6757ba9d 100644
--- a/src/app/pages/navigator/navigator.component.html
+++ b/src/app/pages/navigator/navigator.component.html
@@ -81,13 +81,13 @@
               panelLeftIcon
               (click)="resizeMenu()">
               <ng-container *ngIf="menu.state === 'initial'">
-                expand_less
+                arrow_upward
               </ng-container>
               <ng-container *ngIf="menu.state === 'collapsed'">
-                expand_more
+                arrow_downward
               </ng-container>
               <ng-container *ngIf="menu.state === 'expanded'">
-                expand_less
+                arrow_upward
               </ng-container>
             </md-icon>
 
diff --git a/src/app/pages/navigator/navigator.component.styl b/src/app/pages/navigator/navigator.component.styl
index 93a4ce664..90f1db069 100644
--- a/src/app/pages/navigator/navigator.component.styl
+++ b/src/app/pages/navigator/navigator.component.styl
@@ -25,7 +25,7 @@ md-sidenav-container {
 }
 
 :host >>> igo-sidenav .igo-sidenav {
-  background-color: $igo-white;
+  background-color: $igo-tertiary-color;
 }
 
 /*--- Menu button ---*/
diff --git a/src/app/search/search-bar/search-bar.component.styl b/src/app/search/search-bar/search-bar.component.styl
index 2e11bc571..317e1b3af 100644
--- a/src/app/search/search-bar/search-bar.component.styl
+++ b/src/app/search/search-bar/search-bar.component.styl
@@ -1,7 +1,7 @@
 @require '../../../css/theme.styl';
 
 .igo-search-bar {
-  background-color: $igo-white;
+  background-color: $igo-tertiary-color;
 }
 
 :host >>> .md-input-wrapper {
diff --git a/src/app/search/search-result-details/search-result-details.component.html b/src/app/search/search-result-details/search-result-details.component.html
index 0f906621a..06a0d8385 100644
--- a/src/app/search/search-result-details/search-result-details.component.html
+++ b/src/app/search/search-result-details/search-result-details.component.html
@@ -1,6 +1,6 @@
 <table class="igo-striped">
   <tbody>
-    <tr *ngFor="let property of result.properties | keyvalue">           
+    <tr *ngFor="let property of result.properties | keyvalue">
       <td>
         {{property.key}}
       </td>
diff --git a/src/app/search/search-result-details/search-result-details.component.spec.ts b/src/app/search/search-result-details/search-result-details.component.spec.ts
index f5af6def2..b849251e2 100644
--- a/src/app/search/search-result-details/search-result-details.component.spec.ts
+++ b/src/app/search/search-result-details/search-result-details.component.spec.ts
@@ -30,7 +30,8 @@ describe('SearchResultDetailsComponent', () => {
     component.result = {
       id: '1',
       title: 'foo',
-      icon: 'bar'
+      icon: 'bar',
+      source: 'test'
     };
     expect(component).toBeTruthy();
   });
diff --git a/src/app/search/search-result/search-result.component.html b/src/app/search/search-result/search-result.component.html
index f6727270a..d014f5765 100644
--- a/src/app/search/search-result/search-result.component.html
+++ b/src/app/search/search-result/search-result.component.html
@@ -1,4 +1,4 @@
 <md-list-item>
   <md-icon md-list-avatar>{{result.icon}}</md-icon>
-  <h4 md-line>{{result.source}} - {{result.title}}</h4>
+  <h4 md-line>{{result.title}}</h4>
 </md-list-item>
diff --git a/src/app/search/search-result/search-result.component.spec.ts b/src/app/search/search-result/search-result.component.spec.ts
index edc0c7479..d72a7c796 100644
--- a/src/app/search/search-result/search-result.component.spec.ts
+++ b/src/app/search/search-result/search-result.component.spec.ts
@@ -31,7 +31,8 @@ describe('SearchResultComponent', () => {
     component.result = {
       id: '1',
       title: 'foo',
-      icon: 'bar'
+      icon: 'bar',
+      source: 'test'
     };
     expect(component).toBeTruthy();
   });
diff --git a/src/app/search/search-tool/search-tool.component.html b/src/app/search/search-tool/search-tool.component.html
index 27114581c..0bb9d3566 100644
--- a/src/app/search/search-tool/search-tool.component.html
+++ b/src/app/search/search-tool/search-tool.component.html
@@ -1,12 +1,20 @@
 <igo-list [navigation]="true"> 
-  <template ngFor let-result [ngForOf]="results" let-i="index">
-    <igo-search-result
-      igoListItem
-      tabindex="{{i}}"
-      [focused]="focusedResult && focusedResult.id === result.id"
-      [result]="result"
-      (focusItem)="focusResult(result)"
-      (selectItem)="selectResult(result)">
-    </igo-search-result>
+  <template ngFor let-sourceResult [ngForOf]="sourceResults">
+    <igo-collapsible
+        title="{{sourceResult[0]}} ({{sourceResult[1].length}})">
+
+      <template ngFor let-result [ngForOf]="sourceResult[1]" let-i="index">
+        <igo-search-result
+          igoListItem
+          tabindex="{{i}}"
+          [focused]="focusedResult && focusedResult.id === result.id
+                     && focusedResult.source === sourceResults[0]"
+          [result]="result"
+          (focusItem)="focusResult(result)"
+          (selectItem)="selectResult(result)">
+        </igo-search-result>
+      </template>
+
+    </igo-collapsible>
   </template>
 </igo-list>
diff --git a/src/app/search/search-tool/search-tool.component.ts b/src/app/search/search-tool/search-tool.component.ts
index f7d71fc25..947e617fa 100644
--- a/src/app/search/search-tool/search-tool.component.ts
+++ b/src/app/search/search-tool/search-tool.component.ts
@@ -20,7 +20,7 @@ export class SearchToolComponent implements ToolComponent, OnInit {
   static icon: string = 'search';
   static defaultOptions: any = {};
 
-  private results: SearchResult[];
+  private sourceResults: [string, SearchResult[]];
   focusedResult?: SearchResult;
 
   constructor(private store: Store<AppStore>) { }
@@ -44,23 +44,24 @@ export class SearchToolComponent implements ToolComponent, OnInit {
   }
 
   private handleSearchResults(results: SearchResult[]) {
-    const results_ = results.map((result, index) => {
-      return {index: index, data: result};
-    });
-
-    results_.sort((r1, r2) => {
-      if (r1.data.source < r2.data.source) {
-        return -1;
+    const groupedResults = {};
+    results.forEach((result: SearchResult) => {
+      const source = result.source;
+      if (groupedResults[source] === undefined) {
+        groupedResults[source] = [];
       }
 
-      if (r1.data.source > r2.data.source) {
-        return 1;
-      }
-
-      return r1.index - r2.index;
+      groupedResults[source].push(result);
     });
 
-    this.results = results_.map(result_ => result_.data);
+    const sourceResults = [];
+    Object.keys(groupedResults)
+      .sort()
+      .forEach((source: string) => {
+        sourceResults.push([source, groupedResults[source]]);
+      });
+
+    this.sourceResults = sourceResults as [string, SearchResult[]];
   }
 
 }
diff --git a/src/app/search/sources/search-source-msp.ts b/src/app/search/sources/search-source-msp.ts
index 13ee14970..02ed3f196 100644
--- a/src/app/search/sources/search-source-msp.ts
+++ b/src/app/search/sources/search-source-msp.ts
@@ -7,7 +7,7 @@ import { SearchResult } from '../shared/search-result.interface';
 export class SearchSourceMSP extends SearchSource {
 
   static name_: string = 'MSP';
-  static searchUrl: string = 'icherche/v1/geocodingMaxScore';
+  static searchUrl: string = '/icherche/v1/geocodingMaxScore';
 
   constructor(private jsonp: Jsonp) {
     super();
diff --git a/src/app/shared/collapsible/collapsible.component.html b/src/app/shared/collapsible/collapsible.component.html
new file mode 100644
index 000000000..e736a823e
--- /dev/null
+++ b/src/app/shared/collapsible/collapsible.component.html
@@ -0,0 +1,24 @@
+<div class="igo-collapsible-header">
+  <h4>
+  	<md-icon
+  	  (click)="handleClick()">
+      <ng-container *ngIf="state === 'collapsed'">
+        expand_more
+      </ng-container>
+      <ng-container *ngIf="state !== 'collapsed'">
+        expand_less
+      </ng-container>
+    </md-icon>
+    <div class="igo-collapsible-title">{{title}}</div>
+  </h4>
+</div>
+<ng-content></ng-content>
+<igo-flex
+  #content
+  direction="column"
+  initial="auto"
+  collapsed="0"
+  expanded="auto"
+  [state]="state">
+  <ng-content></ng-content>
+</igo-flex>
diff --git a/src/app/shared/collapsible/collapsible.component.spec.ts b/src/app/shared/collapsible/collapsible.component.spec.ts
new file mode 100644
index 000000000..46b1a897f
--- /dev/null
+++ b/src/app/shared/collapsible/collapsible.component.spec.ts
@@ -0,0 +1,36 @@
+/* tslint:disable:no-unused-variable */
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { DebugElement } from '@angular/core';
+import { MaterialModule } from '@angular/material';
+
+import { FlexComponent } from '../flex/flex.component';
+import { CollapsibleComponent } from './collapsible.component';
+
+describe('CollapsibleComponent', () => {
+  let component: CollapsibleComponent;
+  let fixture: ComponentFixture<CollapsibleComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        MaterialModule.forRoot()
+      ],
+      declarations: [
+        FlexComponent,
+        CollapsibleComponent
+      ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CollapsibleComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/collapsible/collapsible.component.styl b/src/app/shared/collapsible/collapsible.component.styl
new file mode 100644
index 000000000..abd400bb2
--- /dev/null
+++ b/src/app/shared/collapsible/collapsible.component.styl
@@ -0,0 +1,38 @@
+@require '../../../css/theme.styl';
+
+$igo-collapsible-header-height = 40px;
+
+.igo-collapsible-header {
+  color: $igo-primary-font-color;
+  height: $igo-collapsible-header-height;
+  padding: 8px;
+  text-align: center;
+}
+
+.igo-collapsible-header h4 {
+  margin-top: 0px;
+  margin-bottom: 0px;
+}
+
+.igo-collapsible-header md-icon {
+  float: left;
+}
+
+.igo-collapsible-header >>> md-icon {
+  cursor: pointer;
+}
+
+.igo-collapsible-content {
+  padding-left: $igo-padding;
+}
+
+.igo-collapsible-title {
+  display: inline-block;
+  max-width: "calc(100% - 30px - %s)" % $igo-margin;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  margin-left: $igo-margin;
+  float: left;
+  padding: 4px 0;
+}
diff --git a/src/app/shared/collapsible/collapsible.component.ts b/src/app/shared/collapsible/collapsible.component.ts
new file mode 100644
index 000000000..142ee98d1
--- /dev/null
+++ b/src/app/shared/collapsible/collapsible.component.ts
@@ -0,0 +1,27 @@
+import { Component, Input, ViewChild } from '@angular/core';
+
+import { FlexState, FlexComponent } from '../flex/flex.component';
+
+@Component({
+  selector: 'igo-collapsible',
+  templateUrl: './collapsible.component.html',
+  styleUrls: ['./collapsible.component.styl']
+})
+export class CollapsibleComponent {
+
+  @ViewChild('content') content: FlexComponent;
+
+  @Input() state: FlexState = 'expanded';
+  @Input() title: string;
+
+  constructor() { }
+
+  handleClick() {
+    if (this.state !== 'collapsed') {
+      this.state = 'collapsed';
+    } else {
+      this.state = 'expanded';
+    }
+  }
+
+}
diff --git a/src/app/shared/flex/flex.component.html b/src/app/shared/flex/flex.component.html
index 1d8ef1fea..593832b78 100644
--- a/src/app/shared/flex/flex.component.html
+++ b/src/app/shared/flex/flex.component.html
@@ -1,4 +1,4 @@
-<div #flexMain class="igo-flex-main" [ngClass]="state">
+<div #flexMain class="igo-flex-main {{state}} {{direction}}">
   <ng-content></ng-content>
 </div>
 <div class="igo-flex-fill">
diff --git a/src/app/shared/flex/flex.component.styl b/src/app/shared/flex/flex.component.styl
index a5aac880b..036319239 100644
--- a/src/app/shared/flex/flex.component.styl
+++ b/src/app/shared/flex/flex.component.styl
@@ -8,10 +8,17 @@
   flex: 0 0 auto;
   -webkit-flex: 0 0 auto;
   -ms-flex: 0 0 auto; 
-  transition: height 0.25s ease-in;
   overflow: hidden;
 }
 
+.igo-flex-main.column {
+  transition: height 0.25s ease-in;
+}
+
+.igo-flex-main.row {
+  transition: width 0.25s ease-in;
+}
+
 .igo-flex-fill {
   flex: 1 1 auto;
   -webkit-flex: 1 1 auto;
diff --git a/src/app/shared/list/list.component.ts b/src/app/shared/list/list.component.ts
index 028001758..7ebb535cf 100644
--- a/src/app/shared/list/list.component.ts
+++ b/src/app/shared/list/list.component.ts
@@ -19,7 +19,8 @@ export class ListComponent implements AfterViewInit, OnDestroy, OnInit {
 
   @Input('navigation') navigation: boolean = true;
 
-  @ContentChildren(ListItemDirective) listItems: QueryList<ListItemDirective>;
+  @ContentChildren(ListItemDirective, {descendants: true})
+  listItems: QueryList<ListItemDirective>;
 
   @HostListener('document:keydown', ['$event'])
   handleKeyboardEvent(event: KeyboardEvent) {
diff --git a/src/app/shared/panel/panel.component.html b/src/app/shared/panel/panel.component.html
index 6b13afecb..fde647695 100644
--- a/src/app/shared/panel/panel.component.html
+++ b/src/app/shared/panel/panel.component.html
@@ -1,8 +1,8 @@
 <div class="igo-panel-header">
   <h3>
-  	<ng-content select="[panelLeftIcon]"></ng-content>
-  	<div class="igo-panel-title">{{title}}</div>
-  	<ng-content select="[panelRightIcon]"></ng-content>
+    <ng-content select="[panelLeftIcon]"></ng-content>
+    <div class="igo-panel-title">{{title}}</div>
+    <ng-content select="[panelRightIcon]"></ng-content>
   </h3>
 </div>
 <div class="igo-panel-content">
diff --git a/src/app/shared/panel/panel.component.styl b/src/app/shared/panel/panel.component.styl
index 07ab96cf9..07d5e3d7e 100644
--- a/src/app/shared/panel/panel.component.styl
+++ b/src/app/shared/panel/panel.component.styl
@@ -4,7 +4,7 @@ $igo-panel-header-height = 40px;
 
 .igo-panel-header {
   background-color: $igo-primary-color;
-  color: $igo-white;
+  color: $igo-secondary-font-color;
   height: $igo-panel-header-height;
   padding: 8px;
   text-align: center;
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 9f38c49be..1ccb7c93e 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -8,6 +8,7 @@ import { BackdropComponent } from './backdrop/backdrop.component';
 import { FlexComponent } from './flex/flex.component';
 import { SidenavComponent } from './sidenav/sidenav.component';
 import { PanelComponent } from './panel/panel.component';
+import { CollapsibleComponent } from './collapsible/collapsible.component';
 import { ListComponent } from './list/list.component';
 import { ListItemDirective } from './list/list-item.directive';
 import { ClickoutDirective } from './directives/clickout.directive';
@@ -26,6 +27,7 @@ import { KeyvaluePipe } from './pipes/keyvalue.pipe';
     FlexComponent,
     SidenavComponent,
     PanelComponent,
+    CollapsibleComponent,
     ListComponent,
     ListItemDirective,
     ClickoutDirective,
@@ -40,6 +42,7 @@ import { KeyvaluePipe } from './pipes/keyvalue.pipe';
     FlexComponent,
     SidenavComponent,
     PanelComponent,
+    CollapsibleComponent,
     ListComponent,
     ListItemDirective,
     ClickoutDirective,
diff --git a/src/css/styles.styl b/src/css/styles.styl
index 3bc73a5a5..ffa8982c9 100644
--- a/src/css/styles.styl
+++ b/src/css/styles.styl
@@ -36,11 +36,11 @@ button[md-icon-button] {
   min-width: $igo-icon-button-width;
   margin: 0;
   padding: 0;
-  background-color: $igo-white;
+  background-color: $igo-tertiary-color;
 }
 
 button {
-  background-color: $igo-white;
+  background-color: $igo-tertiary-color;
 }
 
 .igo-container {
diff --git a/src/css/theme.styl b/src/css/theme.styl
index ce3de9f15..bc61b9828 100644
--- a/src/css/theme.styl
+++ b/src/css/theme.styl
@@ -1,6 +1,7 @@
 $igo-icon-button-width = 40px;
 
-$igo-white = #fff;
+$igo-primary-font-color = rgb(0, 0, 0);
+$igo-secondary-font-color = rgb(255, 255, 255);
 
 $igo-margin = 5px;
 
@@ -12,6 +13,8 @@ $igo-primary-color-hover = rgba(103, 58, 183, 0.1);
 $igo-secondary-color = rgb(0, 161, 222);
 $igo-secondary-color-hover = rgba(0, 161, 222, 0.1);
 
+$igo-tertiary-color = rgb(255, 255, 255);
+
 $igo-border-width = 1px ;
 $igo-border-style = solid;
 $igo-border-color = rgba(0, 0, 0, .2);