diff --git a/spec/karma.conf2.js b/spec/karma.conf2.js
deleted file mode 100644
index 6838075963cc65dabb8447d9347abd9d3973b06c..0000000000000000000000000000000000000000
--- a/spec/karma.conf2.js
+++ /dev/null
@@ -1,69 +0,0 @@
-// Karma configuration
-// Generated on Mon Aug 06 2018 16:37:20 GMT+0200 (CEST)
-
-module.exports = function(config) {
- config.set({
-
- // base path that will be used to resolve all patterns (eg. files, exclude)
- basePath: '..',
-
-
- // frameworks to use
- // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
- frameworks: ['jasmine'],
-
-
- // list of files / patterns to load in the browser
- files: [
- './spec/test.ts'
- ],
-
-
- // list of files / patterns to exclude
- exclude: [
- ],
-
-
- // preprocess matching files before serving them to the browser
- // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
- preprocessors: {
- },
-
-
- // test results reporter to use
- // possible values: 'dots', 'progress'
- // available reporters: https://npmjs.org/browse/keyword/karma-reporter
- reporters: ['progress'],
-
-
- // web server port
- port: 9876,
-
-
- // enable / disable colors in the output (reporters and logs)
- colors: true,
-
-
- // level of logging
- // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
- logLevel: config.LOG_INFO,
-
-
- // enable / disable watching file and executing tests whenever any file changes
- autoWatch: true,
-
-
- // start these browsers
- // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
- browsers: ['Chrome'],
-
-
- // Continuous Integration mode
- // if true, Karma captures browsers, runs the tests and exits
- singleRun: false,
-
- // Concurrency level
- // how many browser should be started simultaneous
- concurrency: Infinity
- })
-}
diff --git a/src/atlasViewer/atlasViewer.apiService.service.ts b/src/atlasViewer/atlasViewer.apiService.service.ts
index cdd6fb3c3f7317ff4f72990f5bb81ea4ff55ecdf..bd75872dd0b778520175cd11c922eab92c282689 100644
--- a/src/atlasViewer/atlasViewer.apiService.service.ts
+++ b/src/atlasViewer/atlasViewer.apiService.service.ts
@@ -1,8 +1,12 @@
import { Injectable } from "@angular/core";
import { Store, select } from "@ngrx/store";
-import { ViewerStateInterface, safeFilter, getLabelIndexMap } from "../services/stateStore.service";
+import { ViewerStateInterface, safeFilter, getLabelIndexMap, isDefined } from "../services/stateStore.service";
import { Observable } from "rxjs";
-import { map, distinctUntilChanged } from "rxjs/operators";
+import { map, distinctUntilChanged, filter } from "rxjs/operators";
+import { BsModalService } from "ngx-bootstrap/modal";
+import { ModalUnit } from "./modalUnit/modalUnit.component";
+import { ModalHandler } from "../util/pluginHandlerClasses/modalHandler";
+import { ToastHandler } from "../util/pluginHandlerClasses/toastHandler";
declare var window
@@ -14,12 +18,15 @@ export class AtlasViewerAPIServices{
private loadedTemplates$ : Observable<any>
private selectParcellation$ : Observable<any>
+ private selectTemplate$ : Observable<any>
+ private darktheme : boolean
public interactiveViewer : InteractiveViewerInterface
public loadedLibraries : Map<string,{counter:number,src:HTMLElement|null}> = new Map()
constructor(
- private store : Store<ViewerStateInterface>
+ private store : Store<ViewerStateInterface>,
+ private modalService: BsModalService
){
this.loadedTemplates$ = this.store.pipe(
@@ -28,6 +35,13 @@ export class AtlasViewerAPIServices{
map(state=>state.fetchedTemplates)
)
+ this.selectTemplate$ = this.store.pipe(
+ select('viewerState'),
+ filter(state => isDefined(state) && isDefined(state.templateSelected)),
+ map(state => state.templateSelected),
+ distinctUntilChanged((t1, t2) => t1.name === t2.name)
+ )
+
this.selectParcellation$ = this.store.pipe(
select('viewerState'),
safeFilter('parcellationSelected'),
@@ -63,7 +77,37 @@ export class AtlasViewerAPIServices{
map(state=>state.fetchedDataEntries)
)
},
- uiHandle : {},
+ uiHandle : {
+ getModalHandler : () => {
+ const handler = new ModalHandler()
+ let modalRef
+ handler.show = () => {
+ modalRef = this.modalService.show(ModalUnit, {
+ initialState : {
+ title : handler.title,
+ body : handler.body
+ ? handler.body
+ : 'handler.body has yet been defined ...',
+ footer : handler.footer
+ },
+ class : this.darktheme ? 'darktheme' : 'not-darktheme',
+ backdrop : handler.dismissable ? true : 'static',
+ keyboard : handler.dismissable
+ })
+ }
+ handler.hide = () => {
+ if(modalRef){
+ modalRef.hide()
+ modalRef = null
+ }
+ }
+ return handler
+ },
+ /* to be overwritten by atlasViewer.component.ts */
+ getToastHandler : () => {
+ throw new Error('getToast Handler not overwritten by atlasViewer.component.ts')
+ }
+ },
pluginControl : {
loadExternalLibraries : ()=>Promise.reject('load External Library method not over written')
,
@@ -79,6 +123,7 @@ export class AtlasViewerAPIServices{
private init(){
this.loadedTemplates$.subscribe(templates=>this.interactiveViewer.metadata.loadedTemplates = templates)
this.selectParcellation$.subscribe(parcellation => this.interactiveViewer.metadata.regionsLabelIndexMap = getLabelIndexMap(parcellation.regions))
+ this.selectTemplate$.subscribe(template => this.darktheme = template.useTheme === 'dark')
}
}
@@ -113,7 +158,8 @@ export interface InteractiveViewerInterface{
}
uiHandle : {
-
+ getModalHandler : () => ModalHandler
+ getToastHandler : () => ToastHandler
}
pluginControl : {
@@ -123,6 +169,7 @@ export interface InteractiveViewerInterface{
}
}
+
export interface NGLayerObj{
}
\ No newline at end of file
diff --git a/src/atlasViewer/atlasViewer.component.ts b/src/atlasViewer/atlasViewer.component.ts
index 6b80c0f37c8417600a0bcfbc6b2aabbea30e80ba..a982e88385f8e7bad882306aa9df2cc97bffb04f 100644
--- a/src/atlasViewer/atlasViewer.component.ts
+++ b/src/atlasViewer/atlasViewer.component.ts
@@ -19,6 +19,7 @@ import { PluginServices } from "./atlasViewer.pluginService.service";
import '../res/css/extra_styles.css'
import { NehubaContainer } from "../ui/nehubaContainer/nehubaContainer.component";
+import { ToastHandler } from "../util/pluginHandlerClasses/toastHandler";
@Component({
selector: 'atlas-viewer',
@@ -105,6 +106,32 @@ export class AtlasViewer implements OnDestroy, OnInit, AfterViewInit {
ngOnInit() {
+ this.apiService.interactiveViewer.uiHandle.getToastHandler = () => {
+ const handler = new ToastHandler()
+ let toastComponent:ComponentRef<ToastComponent>
+ handler.show = () => {
+ toastComponent = this.toastContainer.createComponent(this.toastComponentFactory)
+
+ toastComponent.instance.dismissable = handler.dismissable
+ toastComponent.instance.message = handler.message
+ toastComponent.instance.timeout = handler.timeout
+
+ const _subscription = toastComponent.instance.dismissed.subscribe(userInitiated => {
+ _subscription.unsubscribe()
+ handler.hide()
+ })
+ }
+
+ handler.hide = () => {
+ if(toastComponent){
+ toastComponent.destroy()
+ toastComponent = null
+ }
+ }
+
+ return handler
+ }
+
this.apiService.interactiveViewer.pluginControl.loadExternalLibraries = (libraries: string[]) => new Promise((resolve, reject) => {
const srcHTMLElement = libraries.map(libraryName => ({
name: libraryName,
diff --git a/src/atlasViewer/atlasViewer.template.html b/src/atlasViewer/atlasViewer.template.html
index cd80d350841f899b564a3f97deb3aed34021db89..320501b42f7d440f5024019f3d3dcb78548241b9 100644
--- a/src/atlasViewer/atlasViewer.template.html
+++ b/src/atlasViewer/atlasViewer.template.html
@@ -41,7 +41,6 @@
</ng-template>
<ng-template #pluginFactory>
-
</ng-template>
</div>
diff --git a/src/atlasViewer/modalUnit/modalUnit.component.ts b/src/atlasViewer/modalUnit/modalUnit.component.ts
index 1bf7a1950438635b15df3160ae5f087c59284f1f..a7fd52717d9086a2fd63cb7451ec50d0846fc2cb 100644
--- a/src/atlasViewer/modalUnit/modalUnit.component.ts
+++ b/src/atlasViewer/modalUnit/modalUnit.component.ts
@@ -10,6 +10,7 @@ import { Component, Input, ViewContainerRef } from '@angular/core'
export class ModalUnit{
@Input() title : string
@Input() body : string = 'Modal Body Text'
+ @Input() footer: string
constructor(public viewContainerRef : ViewContainerRef){
diff --git a/src/atlasViewer/modalUnit/modalUnit.style.css b/src/atlasViewer/modalUnit/modalUnit.style.css
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..619233185073476c359eb2b6188f1a5280a166c2 100644
--- a/src/atlasViewer/modalUnit/modalUnit.style.css
+++ b/src/atlasViewer/modalUnit/modalUnit.style.css
@@ -0,0 +1,8 @@
+:host-context(.darktheme) div.modal-header,
+:host-context(.darktheme) div.modal-body,
+:host-context(.darktheme) div.modal-footer
+{
+ background-color:rgba(50,50,50,1.0);
+ border-color: rgba(0,0,0,0.2);
+ color:white;
+}
\ No newline at end of file
diff --git a/src/atlasViewer/modalUnit/modalUnit.template.html b/src/atlasViewer/modalUnit/modalUnit.template.html
index 4caa1075bb0b55db1eef3a5428c5cd19c07fa91e..abb9fbb959d040759ca2f92942e951989180bb03 100644
--- a/src/atlasViewer/modalUnit/modalUnit.template.html
+++ b/src/atlasViewer/modalUnit/modalUnit.template.html
@@ -6,4 +6,8 @@
<div class = "modal-body">
{{ body }}
+</div>
+
+<div *ngIf = "footer" class = "modal-footer">
+ {{ footer }}
</div>
\ No newline at end of file
diff --git a/src/components/dropdown/dropdown.animation.ts b/src/components/dropdown/dropdown.animation.ts
new file mode 100644
index 0000000000000000000000000000000000000000..9fe53cea634fa63c9b4927eaca3d5c11bd0b6569
--- /dev/null
+++ b/src/components/dropdown/dropdown.animation.ts
@@ -0,0 +1,21 @@
+import { trigger, state, style, transition, animate } from "@angular/animations";
+
+
+export const dropdownAnimation = trigger('showState',[
+ state('show',
+ style({
+ opacity : '1.0'
+ })
+ ),
+ state('hide',
+ style({
+ opacity : '0.0'
+ })
+ ),
+ transition('show => hide', [
+ animate('150ms ease-in')
+ ]),
+ transition('hide => show',[
+ animate('150ms ease-out')
+ ])
+])
\ No newline at end of file
diff --git a/src/components/dropdown/dropdown.component.ts b/src/components/dropdown/dropdown.component.ts
index c13104ffc81e5335ac2c73c7fdbcbda7f6067f81..5495127870b18f2286365e6b36ef622e7b85e56b 100644
--- a/src/components/dropdown/dropdown.component.ts
+++ b/src/components/dropdown/dropdown.component.ts
@@ -1,4 +1,5 @@
import { Component, Input, Output, EventEmitter, ChangeDetectionStrategy } from "@angular/core";
+import { dropdownAnimation } from "./dropdown.animation";
@Component({
selector : 'dropdown',
@@ -22,6 +23,9 @@ ul > li:not(.selected) > span:before
}
`
],
+ animations:[
+ dropdownAnimation
+ ],
changeDetection : ChangeDetectionStrategy.OnPush
})
@@ -34,4 +38,9 @@ export class DropdownComponent{
@Input() activeDisplay : (obj:any|null)=>string = (obj)=>obj ? obj.name : `Please select an item.`
@Output() itemSelected : EventEmitter<any> = new EventEmitter()
+
+ open : boolean = false
+ isOpenChange(event:any){
+ console.log(event)
+ }
}
\ No newline at end of file
diff --git a/src/components/toast/toast.component.ts b/src/components/toast/toast.component.ts
index c12eeb7994f4330acb8ae9444c1a19450e230136..f0ed8c9b8396b06366d7e26b9b7a2e934ac42178 100644
--- a/src/components/toast/toast.component.ts
+++ b/src/components/toast/toast.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, ViewContainerRef, ViewChild } from "@angular/core";
+import { Component, Input, ViewContainerRef, ViewChild, Output, EventEmitter } from "@angular/core";
@Component({
@@ -8,20 +8,30 @@ import { Component, Input, ViewContainerRef, ViewChild } from "@angular/core";
})
export class ToastComponent{
- @Input() message : string = 'template'
+ @Input() message : string
@Input() timeout : number = 0
@Input() dismissable : boolean = true
- @ViewChild('message',{read:ViewContainerRef}) messageContainer : ViewContainerRef
- constructor(){
+ @Output() dismissed : EventEmitter<boolean> = new EventEmitter()
+
+ private timeoutId : number
+ @ViewChild('messageContainer',{read:ViewContainerRef}) messageContainer : ViewContainerRef
+ constructor(){
+
+ }
+
+
+ ngOnInit(){
+ if(this.timeout > 0) this.timeoutId = setTimeout(() => this.dismissed.emit(false), this.timeout)
}
dismiss(event:MouseEvent){
event.preventDefault()
event.stopPropagation()
-
- console.warn('dismiss')
+ if(this.timeoutId) clearTimeout(this.timeoutId)
+
+ this.dismissed.emit(true)
}
}
\ No newline at end of file
diff --git a/src/components/toast/toast.template.html b/src/components/toast/toast.template.html
index 9d4426e628819ba2f7ade1b7629d70aa4f42eea2..579970e3fea5ade79bf5594d500abb5d75db1e1a 100644
--- a/src/components/toast/toast.template.html
+++ b/src/components/toast/toast.template.html
@@ -1,9 +1,12 @@
<div container>
<div message>
- <ng-template #message>
+ <ng-template #messageContainer>
</ng-template>
</div>
+ <div *ngIf = "message">
+ {{ message }}
+ </div>
<div (click) = "dismiss($event)" *ngIf = "dismissable" close>
<i class = "glyphicon glyphicon-remove"></i>
</div>
diff --git a/src/layouts/mainside/mainside.style.css b/src/layouts/mainside/mainside.style.css
index 9f4be14ea9d4da5428fe100796858530446dee82..06af49b9ae31a8cd42ecbfd0d7a948eb33a96d7a 100644
--- a/src/layouts/mainside/mainside.style.css
+++ b/src/layouts/mainside/mainside.style.css
@@ -24,18 +24,18 @@ div[resizeSliver]
:host-context([darktheme="false"]) div[resizeSliver]
{
- background-color:rgba(30,30,30,0.08);
+ background-color:rgba(230,230,230,0.8);
}
:host-context([darktheme="true"]) div[resizeSliver]
{
- background-color:rgba(245,245,245,0.3);
+ background-color:rgba(50,50,50,0.8);
color:rgba(245,245,245,0.8);
}
div[resizeSliver]
{
- z-index: 3;
+ z-index: 5;
display:flex;
flex-direction: row;
align-items: center;
diff --git a/src/plugin_examples/newWebJugex/script.js b/src/plugin_examples/newWebJugex/script.js
index 407425c4d5a4de74f390c1955cf8b4e56d60b17c..1a0652a0c245b5cea2aedac2f27548e10a4240fc 100644
--- a/src/plugin_examples/newWebJugex/script.js
+++ b/src/plugin_examples/newWebJugex/script.js
@@ -1,5 +1,10 @@
(() => {
+ const handler = interactiveViewer.uiHandle.getToastHandler()
+ handler.message = 'hohoho'
+ handler.dismissable = true
+ handler.show()
+
const backendRoot = `http://medpc055.ime.kfa-juelich.de:8005`
const srcRoot = 'http://localhost:10080/newWebJugex'
@@ -75,20 +80,29 @@
removeGene: function (gene) {
this.chosengenes = this.chosengenes.filter(g => g !== gene)
},
+ exportGene: function(){
+ this.$refs.exportGeneAnchor.setAttribute('download', `${Date.now()}.csv`)
+ this.$refs.exportGeneAnchor.click()
+ console.log('export gene')
+ },
startAnalysis: function () {
const body = {
area1: {
name: this.roi1,
PMapURL: this.regionNameToPMapURLMap.get(this.roi1)
},
- mode: false,
area2: {
name: this.roi2,
PMapURL: this.regionNameToPMapURLMap.get(this.roi2)
},
- hemisphere: 'left',
- selectedGenes: this.chosengenes,
- threshold: '0.2'
+
+ simpleMode: this.simpleMode,
+ singleProbeMode: this.singleProbeMode,
+ ignoreCustomProbe: this.ignoreCustomProbe,
+
+ lh: this.lefthemisphere,
+ rh: this.righthemisphere,
+ selectedGenes: this.chosengenes
}
this.$emit('start-analysis', Object.assign({}, body))
@@ -101,6 +115,9 @@
placeholderTextRoi2: function () {
return this.roi2 === '' ? 'Start typing to search ...': this.roi2
},
+ chosenGeneCommaJoined: function(){
+ return this.chosengenes.join(',')
+ },
getAllgenes: function () {
return this.allgenes
}
@@ -182,29 +199,33 @@
coorddata : null
}),
computed: {
+ filename: function(){
+ return `pval_nPerm${this.querydata.nPermutations}_${this.querydata.singleProbeMode ? 'singleProbeMode' : 'allProbeMode'}`
+ },
dateString: function () {
return `${this.datenow.getFullYear().toString()}${normaliseToTwoDigit(this.datenow.getMonth() + 1)}${normaliseToTwoDigit(this.datenow.getDate())}_${normaliseToTwoDigit(this.datenow.getHours())}${normaliseToTwoDigit(this.datenow.getMinutes())}`
}
},
mounted: function () {
- fetch(`${backendRoot}/jugex`,{
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify(this.querydata)
- })
- .then(res=>res.json())
- .then(json => {
- this.status = true
- const rjson = jugexResponseParser(json)
- this.pvaldata = rjson.pval
- this.coorddata = rjson.coord
- })
- .catch(e => {
- this.status = true
- this.error = JSON.stringify(e)
- })
+ console.log(this.querydata)
+ // fetch(`${backendRoot}/jugex`,{
+ // method: 'POST',
+ // headers: {
+ // 'Content-Type': 'application/json'
+ // },
+ // body: JSON.stringify(this.querydata)
+ // })
+ // .then(res=>res.json())
+ // .then(json => {
+ // this.status = true
+ // const rjson = jugexResponseParser(json)
+ // this.pvaldata = rjson.pval
+ // this.coorddata = rjson.coord
+ // })
+ // .catch(e => {
+ // this.status = true
+ // this.error = JSON.stringify(e)
+ // })
}
})
@@ -224,6 +245,7 @@
})
controller.$on('start-analysis', (data) => {
+ /* validation (?) */
result.addAnalysis(data)
})
})
diff --git a/src/plugin_examples/newWebJugex/template.html b/src/plugin_examples/newWebJugex/template.html
index 615a880186622367a5521af9de8a306c53ec7557..657b00eb889f1347b10b2ed8611853552f2317fe 100644
--- a/src/plugin_examples/newWebJugex/template.html
+++ b/src/plugin_examples/newWebJugex/template.html
@@ -82,8 +82,12 @@
</div>
</div>
<div class = "input-group-btn">
- <div webjugex-tooltip = "saves the gene list as a comma delimited, utf8 encoded csv file" class = "btn btn-default fzj.xg.newWebJugex.geneBtns">
+ <div
+ @click = "exportGene"
+ webjugex-tooltip = "saves the gene list as a comma delimited, utf8 encoded csv file"
+ class = "btn btn-default fzj.xg.newWebJugex.geneBtns">
Export
+ <a style = "display:none" ref = "exportGeneAnchor" :href = "'data:text/csv;charset=utf-8,' + chosenGeneCommaJoined">button</a>
</div>
</div>
diff --git a/src/plugin_examples/plugin_api.md b/src/plugin_examples/plugin_api.md
index bbf95aecadfe3fdf38ba8ef446b1a866c710d5db..f68bcbf4a7cc63b3c082eda35cad2ccdd76a2205 100644
--- a/src/plugin_examples/plugin_api.md
+++ b/src/plugin_examples/plugin_api.md
@@ -102,23 +102,16 @@ window.interactiveViewer
- modalControl
- - *getModalHandler()* returns a modalHandlerObject
-
- - *modalHandler*
+ - *getModalHandler()* returns a modalHandlerObject, which has the following methods/properties:
- *hide()* : Dynamically hides the modal
- *show()* : Shows the modal
- - *onHide(callback(reason)=>void)* : Attaches an onHide callback.
- - *onHidden(callback(reason)=>void)* : Attaches an onHidden callback.
- - *onShow(callback(reason)=>void)* : Attaches an onShow callback.
- - *onShown(callback(reason)=>void)* : Attaches an onShown callback.
- title : title of the modal (String)
- - body : body of the modal shown (JSON, Array, String)
+ - body : body of the modal shown (String)
- footer : footer of the modal (String)
- - config : config of the modal
-
- - *viewingModeBSubject* BehaviourSubject emitting strings when viewing mode has changed.
+ - dismissable : whether the modal is dismissable on click backdrop/esc key (Boolean) *n.b. if true, users will not be able to interact with the viewer unless you specifically call `handler.hide()`*
+ - toastControl
- pluginControl
- *loadExternalLibraries([LIBRARY_NAME_1,LIBRARY_NAME_2])* Function that loads external libraries. Pass the name of the libraries as an Array of string, and returns a Promise. When promise resolves, the libraries are loaded. **n.b.** while unlikely, there is a possibility that multiple requests to load external libraries in quick succession can cause the promise to resolve before the library is actually loaded.
diff --git a/src/ui/databrowser/databrowser.component.ts b/src/ui/databrowser/databrowser.component.ts
index 96f6e9d06ce55300958ff4328180a20b0024f82e..c39e3d47e8ee3efa14b1aff92bab1c1176694330 100644
--- a/src/ui/databrowser/databrowser.component.ts
+++ b/src/ui/databrowser/databrowser.component.ts
@@ -34,7 +34,7 @@ export class DataBrowserUI implements OnDestroy,OnInit{
spatialTotalNo : number = 0
hideDataTypes : Set<string> = new Set()
- private _spatialDataVisible : boolean = true
+ private _spatialDataVisible : boolean = false
private spatialSearchObj : {center:[number,number,number],searchWidth:number,templateSpace : string,pageNo:number}
dedicatedViewString : string | null
@@ -213,6 +213,9 @@ export class DataBrowserUI implements OnDestroy,OnInit{
if(isDefined(state.spatialDataVisible))
this._spatialDataVisible = state.spatialDataVisible
+ if(this._spatialDataVisible === false)
+ return
+
if(this.spatialPagination === this.spatialSearchObj.pageNo)
return
diff --git a/src/util/pipes/copyProperty.pipe.spec.ts b/src/util/pipes/copyProperty.pipe.spec.ts
index 993af71f0a788a34c425b290555d825c32904305..548df650ab385b60a615859327d9c4b8605c82ca 100644
--- a/src/util/pipes/copyProperty.pipe.spec.ts
+++ b/src/util/pipes/copyProperty.pipe.spec.ts
@@ -1,19 +1,27 @@
import { CopyPropertyPipe } from './copyProperty.pipe'
import {} from 'jasmine'
+const array = [{
+ name : 'name1',
+ key1 : 'value1'
+},{
+ name : 'name2',
+ key1 : 'value2'
+},{
+ name : 'name3',
+ key1 : 'value3',
+ key2 : 'oldvalue3'
+},{
+ name : 'name4',
+ key2 : 'oldValue4'
+}]
+
describe('copyProperty.pipe works as expected', () => {
it('jasmine works', () => {
expect(1).toBe(1)
})
- it('pipe should work', () => {
+ it('copyProperty pipe should copy value of key1 as value of key2, even means overwriting old value', () => {
const pipe = new CopyPropertyPipe()
- const array = [{
- name : 'name1',
- key1 : 'value1'
- },{
- name : 'name2',
- key1 : 'value2'
- }]
const newItem = pipe.transform(array,'key1','key2')
expect(newItem[0]).toEqual({
@@ -27,5 +35,32 @@ describe('copyProperty.pipe works as expected', () => {
key1 : 'value2',
key2 : 'value2'
})
+
+ expect(newItem[2]).toEqual({
+ name : 'name3',
+ key1 : 'value3',
+ key2 : 'value3'
+ })
+
+ expect(newItem[3]).toEqual({
+ name : 'name4',
+ key2 : undefined
+ })
+ })
+ it('if given undefined or null as array input, will return an emtpy array', () => {
+ const pipe = new CopyPropertyPipe()
+ const nullItem = pipe.transform(null,'key1','key2')
+ expect(nullItem).toEqual([])
+
+ const undefinedItem = pipe.transform(undefined, 'key1','key2')
+ expect(undefinedItem).toEqual([])
+ })
+ it('if either keys are undefined, return the original array, or emtpy array if original array is undefined', () => {
+ const pipe = new CopyPropertyPipe()
+ const nokey1 = pipe.transform(array, null, 'key2')
+ expect(nokey1).toEqual(array)
+
+ const nokey2 = pipe.transform(array, 'key1', null)
+ expect(nokey2).toEqual(array)
})
})
\ No newline at end of file
diff --git a/src/util/pipes/copyProperty.pipe.ts b/src/util/pipes/copyProperty.pipe.ts
index e065c0943b360fe68ba197c4372919a92a90f315..0d9aec8897794536271d882d872b303ae577cfcb 100644
--- a/src/util/pipes/copyProperty.pipe.ts
+++ b/src/util/pipes/copyProperty.pipe.ts
@@ -5,9 +5,17 @@ import { PipeTransform, Pipe } from "@angular/core";
})
export class CopyPropertyPipe implements PipeTransform{
+ private isDefined(obj){
+ return typeof obj !== 'undefined' && obj !== null
+ }
public transform(inputArray:any[],src:string,dest:string):any[]{
- if(!inputArray)
+ if(!this.isDefined(inputArray))
return []
+ if(!this.isDefined(src) || !this.isDefined(dest) )
+ return this.isDefined(inputArray)
+ ? inputArray
+ : []
+
return inputArray.map(item=>{
const newObj = Object.assign({},item)
newObj[dest] = item[src]
diff --git a/src/util/pipes/groupDataEntriesByRegion.pipe.ts b/src/util/pipes/groupDataEntriesByRegion.pipe.ts
index 3d2ab267de27c1c0d09126929543229469c40e76..7c2986db80ad5ebb4152f332f70aa402473cf3be 100644
--- a/src/util/pipes/groupDataEntriesByRegion.pipe.ts
+++ b/src/util/pipes/groupDataEntriesByRegion.pipe.ts
@@ -5,44 +5,38 @@ import { DataEntry } from "../../services/stateStore.service";
name : 'groupDatasetByRegion'
})
export class GroupDatasetByRegion implements PipeTransform{
- public transform(
- datasets:DataEntry[],
- regions:any[]
- ) : {region:any|null,searchResults:DataEntry[]}[]
+ public transform(datasets:DataEntry[], regions:any[]): {region:any|null,searchResults:DataEntry[]}[]
{
return datasets.reduce((acc,curr)=>{
- return (curr.regionName && curr.regionName.length > 0) ?
- curr.regionName.reduce((acc2,reName)=>{
- const idx = acc
- .findIndex(it => it.region === null ?
- reName.regionName === 'none' :
- it.region.name === reName.regionName )
+ return (curr.regionName && curr.regionName.length > 0)
+ ? curr.regionName.reduce((acc2,reName)=>{
+ const idx = acc.findIndex(it => it.region === null
+ ? reName.regionName === 'none'
+ : it.region.name === reName.regionName )
- return idx >= 0 ?
- acc2.map((v,i)=> i === idx ? Object.assign({},v,{searchResults : v.searchResults.concat(curr)}) : v ) :
- acc2.concat({
- region : this.getRegionFromRegionName(reName.regionName, regions),
- searchResults : [ curr ]
+ return idx >= 0
+ ? acc2.map((v,i)=> i === idx
+ ? Object.assign({},v,{searchResults : v.searchResults.concat(curr)})
+ : v )
+ : acc2.concat({
+ region : this.getRegionFromRegionName(reName.regionName, regions),
+ searchResults : [ curr ]
+ })
+ },acc)
+ : acc.findIndex(it=>it.region==null) >= 0
+ ? acc.map(it=>it.region === null
+ ? Object.assign({}, it, {searchResults: it.searchResults.concat(curr)})
+ : it)
+ : acc.concat({
+ region : null,
+ searchResults : [curr]
})
- },acc) :
- acc.findIndex(it=>it.region==null) >= 0 ?
- acc.map(it=>it.region === null ?
- Object.assign({},it,{
- searchResults:it.searchResults.concat(curr)
- }) :
- it) :
- acc.concat({
- region : null,
- searchResults : [curr]
- })
-
- },[] as {region:any|null,searchResults:DataEntry[]}[])
+ }, [] as {region:any|null,searchResults:DataEntry[]}[])
}
private getRegionFromRegionName(regionName:string,regions:any[]):any|null{
const idx = regions.findIndex(re=>re.name == regionName)
return idx >= 0 ? regions[idx] : null
}
-
}
\ No newline at end of file
diff --git a/src/util/pipes/pathToNestedChildren.pipe.spec.ts b/src/util/pipes/pathToNestedChildren.pipe.spec.ts
index 79fad121e1d5da39433eb85359f4654621368e97..3810225a2cd8830bb1e1b2b0417377c79c304dd0 100644
--- a/src/util/pipes/pathToNestedChildren.pipe.spec.ts
+++ b/src/util/pipes/pathToNestedChildren.pipe.spec.ts
@@ -2,10 +2,105 @@
* path to nested children should successfully convert flat array to nested objects
*/
- import {} from 'jasmine'
+import { PathToNestedChildren } from './pathToNestedChildren.pipe'
- describe('path to nested children', () => {
- it('jasmine works', () => {
- expect(1).toBe(1)
- })
- })
\ No newline at end of file
+import {} from 'jasmine'
+
+const array1 = [{
+ pizza : 'pineapple',
+ path : 'root1'
+},{
+ path: 'root2'
+}]
+
+const expectedArray1 = [{
+ pizza : 'pineapple',
+ path : 'root1',
+ children : []
+},{
+ path : 'root2',
+ children : []
+}]
+
+const array2 = [{
+ path : 'root'
+},{
+ path : 'root/dir'
+}]
+const expectedArray2 = [{
+ path : 'root',
+ children : [{
+ path : 'dir',
+ children : []
+ }]
+}]
+
+const array3 = [{
+ name : 'eagle',
+ path : 'root1/dir1'
+},{
+ path : 'root1/dir2'
+},{
+ path : 'root2/dir3'
+},{
+ path : 'root2/dir4'
+}]
+const expectedArray3 = [{
+ path : 'root1',
+ children : [{
+ name : 'eagle',
+ path : 'dir1',
+ children : []
+ },{
+ path : 'dir2',
+ children : []
+ }]
+},{
+ path :'root2',
+ children :[{
+ path : 'dir3',
+ children : []
+ },{
+ path : 'dir4',
+ children : []
+ }]
+}]
+
+const array4 = [{
+ path : 'root1/3\\/4'
+}]
+
+const expectedArray4 = [{
+ path : 'root1',
+ children : [{
+ path : '3\\/4',
+ children : []
+ }]
+}]
+
+const pipe = new PathToNestedChildren()
+
+describe('path to nested children', () => {
+ it('jasmine works', () => {
+ expect(1).toBe(1)
+ })
+
+ it('transforms all single heirachy to a flat structure', () => {
+ const transformed = pipe.transform(array1)
+ expect(transformed).toEqual(expectedArray1)
+ })
+
+ it('transforms nested hierachy correctly', () => {
+
+ const transformed2 = pipe.transform(array2)
+ expect(transformed2).toEqual(expectedArray2)
+
+ const transformed3 = pipe.transform(array3)
+ expect(transformed3).toEqual(expectedArray3)
+ })
+
+ it('handles escapes characters fine', () => {
+ const transformed4 = pipe.transform(array4)
+ expect(transformed4).toEqual(expectedArray4)
+ })
+})
\ No newline at end of file
diff --git a/src/util/pipes/temp.ts b/src/util/pipes/temp.ts
deleted file mode 100644
index 560fd1b94c479e0d18490d82b6f55afddcc43094..0000000000000000000000000000000000000000
--- a/src/util/pipes/temp.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export class TempClass{
-
-}
\ No newline at end of file
diff --git a/src/util/pipes/treeSearch.pipe.ts b/src/util/pipes/treeSearch.pipe.ts
index 5f26c05c662b0caae9b8a0d2c5736a0aa0413f6b..35a31e8aaa17372a33a26a9f1d483f8e3cbb4a64 100644
--- a/src/util/pipes/treeSearch.pipe.ts
+++ b/src/util/pipes/treeSearch.pipe.ts
@@ -1,6 +1,5 @@
import { PipeTransform, Pipe } from "@angular/core";
-
@Pipe({
name : 'treeSearch'
})
diff --git a/src/util/pluginHandlerClasses/modalHandler.ts b/src/util/pluginHandlerClasses/modalHandler.ts
new file mode 100644
index 0000000000000000000000000000000000000000..07cc76cf3f6c031243869333b6459dfb6d115faa
--- /dev/null
+++ b/src/util/pluginHandlerClasses/modalHandler.ts
@@ -0,0 +1,14 @@
+export class ModalHandler{
+
+ hide : () => void
+ show : () => void
+ // onHide : (callback: () => void) => void
+ // onHidden : (callback : () => void) => void
+ // onShow : (callback : () => void) => void
+ // onShown : (callback : () => void) => void
+ title : string
+ body : string
+ footer : String
+
+ dismissable: boolean = true
+}
\ No newline at end of file
diff --git a/src/util/pluginHandlerClasses/toastHandler.ts b/src/util/pluginHandlerClasses/toastHandler.ts
new file mode 100644
index 0000000000000000000000000000000000000000..deae6df7ca4eb39412cee1e5d0398a7ea95d4198
--- /dev/null
+++ b/src/util/pluginHandlerClasses/toastHandler.ts
@@ -0,0 +1,7 @@
+export class ToastHandler{
+ message : string = 'handler.body'
+ timeout : number = 3000
+ dismissable : boolean = true
+ show : () => void
+ hide : () => void
+}
\ No newline at end of file