Merge pull request #70 from thehyve/rc-1.0.1

Release 1.0.1
thehyve · Jan 16, 2018 · a5836d1 · a5836d1
2 parents e30ef5d + 5360a34
commit a5836d1
Show file tree

Hide file tree

Showing 34 changed files with 231 additions and 129 deletions.
diff --git a/README.md b/README.md
@@ -36,11 +36,11 @@ gradle wrapper
 cd src/main/user-interface
 npm start
 
-# Package, creates build/lib/data-showcase-1.0.0.war
+# Package, creates build/lib/data-showcase-1.0.1.war
 ./gradlew assemble
 
 # Run the war
-java -jar build/libs/data-showcase-1.0.0.war
+java -jar build/libs/data-showcase-1.0.1.war
 ```
 
 ## Publish
@@ -64,7 +64,7 @@ and run the application with an external config file:
 MEMORY_OPTIONS="-Xms2g -Xmx2g -XX:MaxPermSize=512m"
 JAVA_OPTIONS="-server -Djava.awt.headless=true -Djava.security.egd=file:/dev/./urandom"
 APP_OPTIONS="-Dgrails.env=prod -Dspring.config.location=/home/user/data-showcase-internal.yml"
-java -jar ${JAVA_OPTIONS} ${MEMORY_OPTIONS} ${APP_OPTIONS} data-showcase-1.0.0.war
+java -jar ${JAVA_OPTIONS} ${MEMORY_OPTIONS} ${APP_OPTIONS} data-showcase-1.0.1.war
 ```
 
 Example configuration file `data-showcase-internal.yml`:
@@ -103,7 +103,7 @@ For user interface end-to-end tests, see [user-interface](data-showcase/src/main
 Bamboo plan: [DS-DEV](https://ci.ctmmtrait.nl/browse/DS-DEV).
 
 ## License
-Copyright &copy; 2017  The Hyve B.V.
+Copyright &copy; 2017&ndash;2018  The Hyve B.V.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as

diff --git a/data-showcase/build.gradle b/data-showcase/build.gradle
@@ -13,7 +13,7 @@ buildscript {
 }
 
 ext {
-    dataShowcaseVersion = '1.0.0'
+    dataShowcaseVersion = '1.0.1'
     nodeVersion = '7.10.1'
     modelMapperVersion = '1.1.0'
 }

diff --git a/data-showcase/src/main/user-interface/package.json b/data-showcase/src/main/user-interface/package.json
@@ -1,7 +1,7 @@
 {
   "name": "data-showcase",
-  "version": "0.0.1",
-  "license": "MIT",
+  "version": "1.0.1",
+  "license": "AGPL-3.0-only",
   "scripts": {
     "grammar": "./node_modules/nearley/bin/nearleyc.js ./src/app/search-text-parser/grammar.ne -o ./src/app/search-text-parser/grammar.ts",
     "pretest": "npm run grammar",

diff --git a/data-showcase/src/main/user-interface/src/app/app.component.css b/data-showcase/src/main/user-interface/src/app/app.component.css
@@ -27,7 +27,7 @@
 }
 
 .ds-body {
-    padding: 20px;
+    padding-top: 10px;
 }
 
 .gutter {
@@ -74,14 +74,10 @@
     float: right;
 }
 
-.ds-info {
-    padding-right: 20px;
-    padding-left: 20px;
-    padding-top: 25px;
-    float: right;
+.ds-footer {
+    text-align: center;
 }
 
-.ds-info,
 .ds-logos,
 .ds-shopping-cart{
     height: 100px;

diff --git a/data-showcase/src/main/user-interface/src/app/app.component.html b/data-showcase/src/main/user-interface/src/app/app.component.html
@@ -18,7 +18,6 @@
         <div class="ds-header">
             <app-logos class="ds-logos"></app-logos>
             <app-shopping-cart class="ds-shopping-cart"></app-shopping-cart>
-            <app-info class="ds-info"></app-info>
             <app-page-ribbon></app-page-ribbon>
         </div>
         <div class="ds-body">
@@ -27,6 +26,9 @@
             <app-filters></app-filters>
             <app-item-table></app-item-table>
         </div>
+        <div class="ds-footer">
+            <app-footer></app-footer>
+        </div>
     </div>
 </div>
 
diff --git a/data-showcase/src/main/user-interface/src/app/app.component.spec.ts b/data-showcase/src/main/user-interface/src/app/app.component.spec.ts
@@ -28,10 +28,10 @@ import {ItemSummaryComponent} from "./item-summary/item-summary.component";
 import {LogosComponent} from "./logos/logos.component";
 import {PageRibbonComponent} from "./page-ribbon/page-ribbon.component";
 import {FiltersModule} from "./filters/filters.module";
-import {InfoModule} from "./info/info.module";
 import {SearchParserService} from "./services/search-parser.service";
 import {DSMessageService} from "./services/ds-message.service";
 import {MessageService} from "primeng/components/common/messageservice";
+import {FooterComponent} from "./footer/footer.component";
 
 describe('AppComponent', () => {
   beforeEach(async(() => {
@@ -44,6 +44,7 @@ describe('AppComponent', () => {
         ShoppingCartComponent,
         ItemSummaryComponent,
         LogosComponent,
+        FooterComponent,
         AppComponent
       ],
       imports: [
@@ -59,7 +60,6 @@ describe('AppComponent', () => {
         BrowserAnimationsModule,
         DialogModule,
         HttpModule,
-        InfoModule,
         PaginatorModule,
         CheckboxModule,
         GrowlModule

diff --git a/data-showcase/src/main/user-interface/src/app/app.module.ts b/data-showcase/src/main/user-interface/src/app/app.module.ts
@@ -21,11 +21,11 @@ import {ItemSummaryModule} from "./item-summary/item-summary.module";
 import {LogosComponent} from './logos/logos.component';
 import {PageRibbonComponent} from './page-ribbon/page-ribbon.component';
 import {FiltersModule} from "./filters/filters.module";
-import {InfoModule} from "./info/info.module";
 import {SearchParserService} from "./services/search-parser.service";
 import {GrowlModule} from "primeng/primeng";
 import {DSMessageService} from "./services/ds-message.service";
 import {MessageService} from "primeng/components/common/messageservice";
+import { FooterComponent } from './footer/footer.component';
 
 export function initConfig(config: AppConfig) {
   return () => config.load()
@@ -35,7 +35,8 @@ export function initConfig(config: AppConfig) {
   declarations: [
     AppComponent,
     LogosComponent,
-    PageRibbonComponent
+    PageRibbonComponent,
+    FooterComponent
   ],
   imports: [
     BrowserModule,
@@ -47,7 +48,6 @@ export function initConfig(config: AppConfig) {
     ItemTableModule,
     ShoppingCartModule,
     ItemSummaryModule,
-    InfoModule,
     GrowlModule
   ],
   providers: [

diff --git a/...se/src/main/user-interface/src/app/filters/checkbox-filter/checkbox-filter.component.html b/...se/src/main/user-interface/src/app/filters/checkbox-filter/checkbox-filter.component.html
@@ -9,7 +9,7 @@
 </div>
 <div class="ui-g" *ngIf="!rerender">
     <div class="ui-g-6">
-        <p-fieldset legend="Filter by research lines">
+        <p-fieldset legend="Filter by research types">
             <p-listbox [options]="researchLines" [(ngModel)]="selectedResearchLines" [filter]=true [multiple]=true
                        [checkbox]="researchLines.length > 0" [disabled]="researchLines.length < 1"
                        [metaKeySelection]=false (onChange)="onResearchLineSelect()"></p-listbox>

diff --git a/data-showcase/src/main/user-interface/src/app/filters/filters.component.css b/data-showcase/src/main/user-interface/src/app/filters/filters.component.css
@@ -1,7 +1,5 @@
 
 .filter-container {
-    margin-left: 10px;
-    margin-right: 10px;
     /* padding: top right bottom left */
     padding: 0 10px 0 10px;
     min-width: 800px;

diff --git a/data-showcase/src/main/user-interface/src/app/filters/filters.component.spec.ts b/data-showcase/src/main/user-interface/src/app/filters/filters.component.spec.ts
@@ -3,7 +3,10 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { FiltersComponent } from './filters.component';
 import {HttpModule} from "@angular/http";
 import {BrowserAnimationsModule} from "@angular/platform-browser/animations";
-import {AutoCompleteModule, DataListModule, FieldsetModule, ListboxModule, PanelModule} from "primeng/primeng";
+import {
+  AccordionModule, AutoCompleteModule, DataListModule, FieldsetModule, ListboxModule,
+  PanelModule, SidebarModule
+} from "primeng/primeng";
 import {FormsModule} from "@angular/forms";
 import {TextFilterComponent} from "./text-filter/text-filter.component";
 import {CheckboxFilterComponent} from "./checkbox-filter/checkbox-filter.component";
@@ -14,14 +17,15 @@ import {AppConfigMock} from "../config/app.config.mock";
 import {SearchParserService} from "../services/search-parser.service";
 import {DSMessageService} from "../services/ds-message.service";
 import {MessageService} from "primeng/components/common/messageservice";
+import {InfoComponent} from "./text-filter/info/info.component";
 
 describe('FiltersComponent', () => {
   let component: FiltersComponent;
   let fixture: ComponentFixture<FiltersComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ FiltersComponent, TextFilterComponent, CheckboxFilterComponent ],
+      declarations: [ FiltersComponent, TextFilterComponent, CheckboxFilterComponent, InfoComponent ],
       imports: [
         FormsModule,
         PanelModule,
@@ -30,7 +34,9 @@ describe('FiltersComponent', () => {
         DataListModule,
         ListboxModule,
         BrowserAnimationsModule,
-        HttpModule
+        HttpModule,
+        SidebarModule,
+        AccordionModule
       ],
       providers: [
         DataService,

diff --git a/data-showcase/src/main/user-interface/src/app/filters/filters.module.ts b/data-showcase/src/main/user-interface/src/app/filters/filters.module.ts
@@ -1,11 +1,16 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import {FormsModule} from "@angular/forms";
-import {AutoCompleteModule, ButtonModule, FieldsetModule, ListboxModule, PanelModule, TooltipModule} from "primeng/primeng";
+import {
+  AccordionModule,
+  AutoCompleteModule, ButtonModule, FieldsetModule, ListboxModule, PanelModule, SidebarModule,
+  TooltipModule
+} from "primeng/primeng";
 import {FiltersComponent} from "./filters.component";
 import {CheckboxFilterComponent} from "./checkbox-filter/checkbox-filter.component";
 import {TextFilterComponent} from "./text-filter/text-filter.component";
 import {SearchParserService} from "../services/search-parser.service";
+import {InfoComponent} from "./text-filter/info/info.component";
 
 @NgModule({
   imports: [
@@ -16,9 +21,11 @@ import {SearchParserService} from "../services/search-parser.service";
     FormsModule,
     ListboxModule,
     PanelModule,
-    TooltipModule
+    TooltipModule,
+    SidebarModule,
+    AccordionModule
   ],
-  declarations: [FiltersComponent, TextFilterComponent, CheckboxFilterComponent],
+  declarations: [FiltersComponent, TextFilterComponent, CheckboxFilterComponent, InfoComponent],
   exports: [FiltersComponent],
   providers: [SearchParserService]
 })

diff --git a/...interface/src/app/info/info.component.css → ...lters/text-filter/info/info.component.css b/...interface/src/app/info/info.component.css → ...lters/text-filter/info/info.component.css
@@ -7,7 +7,8 @@
 
 .info-header {
     font-weight:normal;
-    margin-top: .7em;
+    margin-top: .5em;
+
 }
 
 .info-title {

diff --git a/...nterface/src/app/info/info.component.html → ...ters/text-filter/info/info.component.html b/...nterface/src/app/info/info.component.html → ...ters/text-filter/info/info.component.html
@@ -5,14 +5,8 @@
   -->
 
 <p-sidebar [(visible)]="display" position="bottom" [blockScroll]="false"
-           [style]="{ height: '500px', 'overflow-y': 'auto'}">
-    <h1 class="info-header info-title">Help information</h1>
-    <h2 class="info-header">General</h2>
-    <p>
-    General information about the application.
-    </p>
-
-    <h2 class="info-header">Search</h2>
+           [style]="{ height: '500px', 'overflow-y': 'auto', 'text-align': 'left'}">
+    <h1 class="info-header info-title">Search information</h1>
     <p-accordion [multiple]="true">
         <p-accordionTab header="Composing a query">
             General structure of the query is:
@@ -76,13 +70,6 @@ <h2 class="info-header">Search</h2>
             <br /><i>e.g.</i>, <code>((name = "value1") OR (name = "value2")) AND (NOT labelLong = "value3")</code>
         </p-accordionTab>
     </p-accordion>
-
-    <h2 class="info-header">About</h2>
-    <p>
-        This application is <a href="https://opensource.org/osd">open source software</a>.
-        The <a href="https://github.com/thehyve/data-showcase">source code</a> is available
-        under the terms of the <a href="https://opensource.org/licenses/AGPL-3.0">GNU Affero General Public License</a>.
-    </p>
 </p-sidebar>
 
 <!--TODO Option2: to be discussed which one is better-->

diff --git a/...rface/src/app/info/info.component.spec.ts → ...s/text-filter/info/info.component.spec.ts b/...rface/src/app/info/info.component.spec.ts → ...s/text-filter/info/info.component.spec.ts
diff --git a/...-interface/src/app/info/info.component.ts → ...ilters/text-filter/info/info.component.ts b/...-interface/src/app/info/info.component.ts → ...ilters/text-filter/info/info.component.ts
diff --git a/data-showcase/src/main/user-interface/src/app/filters/text-filter/text-filter.component.css b/data-showcase/src/main/user-interface/src/app/filters/text-filter/text-filter.component.css
@@ -6,11 +6,11 @@
 
 .text-filter-container {
     text-align: center;
-    height: 65px;
+    height: 50px;
     line-height: 40px;
     white-space: nowrap;
     display: block;
-    padding-bottom: 5px;
+    padding-bottom: 0;
     border-bottom: 1px solid lightgray;
 }
 .text-filter-container:focus {outline:none;}

diff --git a/data-showcase/src/main/user-interface/src/app/filters/text-filter/text-filter.component.html b/data-showcase/src/main/user-interface/src/app/filters/text-filter/text-filter.component.html
@@ -5,18 +5,30 @@
   -->
 
 <div class="text-filter-container">
-    <div class="search-label">
-        Search by keywords, item name, item labels:
-    </div>
-    <i class="fa fa-search" style="font-size:24px"></i>
-    <p-autoComplete [(ngModel)]="textFilter"
-                    placeholder="Enter search term"
-                    class="text-filter"
-                    (onClear)="onFiltering($event)"
-                    (completeMethod)="removePrimeNgAutocompleteLoader()"
-                    (onKeyUp)="onKeyUp($event)">
-    </p-autoComplete>
-    <button pButton type="button" label="Search" class="export-button" (click)="onFiltering($event);"></button>
+    <table>
+        <tr>
+            <td width="20%" style="text-align: right; padding-right: 10px">
+                <div class="search-label">
+                    Search by keywords, item name, <br/>item labels:
+                </div>
+            </td>
+            <td width="70%">
+                <i class="fa fa-search" style="font-size:24px"></i>
+                <p-autoComplete [(ngModel)]="textFilter"
+                                placeholder="Enter search term"
+                                class="text-filter"
+                                (onClear)="onFiltering($event)"
+                                (completeMethod)="removePrimeNgAutocompleteLoader()"
+                                (onKeyUp)="onKeyUp($event)">
+                </p-autoComplete>
+                <button pButton type="button" label="Search" class="export-button"
+                        (click)="onFiltering($event);"></button>
+            </td>
+            <td width="10%" style="text-align: left">
+                <app-info></app-info>
+            </td>
+        </tr>
+    </table>
 </div>
 <div *ngIf="searchQueryHtml.length > 0" class="search-query" role="alert">
     <span pTooltip="Active search filter" tooltipPosition="bottom">

diff --git a/...howcase/src/main/user-interface/src/app/filters/text-filter/text-filter.component.spec.ts b/...howcase/src/main/user-interface/src/app/filters/text-filter/text-filter.component.spec.ts
@@ -7,7 +7,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { TextFilterComponent } from './text-filter.component';
-import {AutoCompleteModule} from "primeng/primeng";
+import {AccordionModule, AutoCompleteModule, SidebarModule} from "primeng/primeng";
 import {FormsModule} from "@angular/forms";
 import {ResourceService} from "../../services/resource.service";
 import {DataService} from "../../services/data.service";
@@ -17,18 +17,23 @@ import {AppConfigMock} from "../../config/app.config.mock";
 import {SearchParserService} from "../../services/search-parser.service";
 import {DSMessageService} from "../../services/ds-message.service";
 import {MessageService} from "primeng/components/common/messageservice";
+import {InfoComponent} from "./info/info.component";
+import {BrowserAnimationsModule} from "@angular/platform-browser/animations";
 
 describe('TextFilterComponent', () => {
   let component: TextFilterComponent;
   let fixture: ComponentFixture<TextFilterComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ TextFilterComponent ],
+      declarations: [ TextFilterComponent, InfoComponent ],
       imports: [
         FormsModule,
         AutoCompleteModule,
-        HttpModule
+        HttpModule,
+        SidebarModule,
+        AccordionModule,
+        BrowserAnimationsModule
       ],
       providers: [
         DataService,

diff --git a/data-showcase/src/main/user-interface/src/app/footer/footer.component.css b/data-showcase/src/main/user-interface/src/app/footer/footer.component.css
@@ -0,0 +1,7 @@
+p {
+    border-top: 1px solid lightgrey;
+    font-size: small;
+    vertical-align: middle;
+    height: 30px;
+    margin-bottom: 0;
+}
diff --git a/data-showcase/src/main/user-interface/src/app/footer/footer.component.html b/data-showcase/src/main/user-interface/src/app/footer/footer.component.html
@@ -0,0 +1,5 @@
+<p>
+  This application is <a href="https://opensource.org/osd">open source software</a>.
+  The <a href="https://github.com/thehyve/data-showcase">source code</a> is available
+  under the terms of the <a href="https://opensource.org/licenses/AGPL-3.0">GNU Affero General Public License</a>.
+</p>