From 3e78e5f4d1f0dd53b70c2c4316185f72557ab8b4 Mon Sep 17 00:00:00 2001
From: Xiao Gui <xgui3783@gmail.com>
Date: Mon, 26 Aug 2019 12:19:14 +0200
Subject: [PATCH] chore: pipefy get background color chore: remove uncessary
imports
---
src/components/panel/panel.component.ts | 3 +--
src/ui/databrowserModule/databrowser.module.ts | 4 +++-
src/ui/databrowserModule/databrowser.service.ts | 6 ------
.../databrowser/databrowser.component.ts | 4 ----
.../databrowser/databrowser.template.html | 4 ++--
.../util/regionBackgroundToRgb.pipe.ts | 13 +++++++++++++
6 files changed, 19 insertions(+), 15 deletions(-)
create mode 100644 src/ui/databrowserModule/util/regionBackgroundToRgb.pipe.ts
diff --git a/src/components/panel/panel.component.ts b/src/components/panel/panel.component.ts
index 6b2c5095c..9b7c3491a 100644
--- a/src/components/panel/panel.component.ts
+++ b/src/components/panel/panel.component.ts
@@ -1,5 +1,4 @@
-import { Component, Input, ViewChild, ElementRef, AfterContentChecked, ChangeDetectionStrategy, ChangeDetectorRef, OnChanges, SimpleChanges, HostBinding, ApplicationRef } from "@angular/core";
-import { panelAnimations } from "./panel.animation";
+import { Component, Input, ViewChild, ElementRef, ChangeDetectionStrategy } from "@angular/core";
import { ParseAttributeDirective } from "../parseAttribute.directive";
@Component({
diff --git a/src/ui/databrowserModule/databrowser.module.ts b/src/ui/databrowserModule/databrowser.module.ts
index d272cf211..42dcfc430 100644
--- a/src/ui/databrowserModule/databrowser.module.ts
+++ b/src/ui/databrowserModule/databrowser.module.ts
@@ -25,6 +25,7 @@ import { KgSingleDatasetService } from "./kgSingleDatasetService.service"
import { SingleDatasetView } from './singleDataset/singleDataset.component'
import { AngularMaterialModule } from 'src/ui/sharedModules/angularMaterial.module'
import { DoiParserPipe } from "src/util/pipes/doiPipe.pipe";
+import { RegionBackgroundToRgbPipe } from "./util/regionBackgroundToRgb.pipe";
@NgModule({
imports:[
@@ -56,7 +57,8 @@ import { DoiParserPipe } from "src/util/pipes/doiPipe.pipe";
FilterDataEntriesbyMethods,
FilterDataEntriesByRegion,
AggregateArrayIntoRootPipe,
- DoiParserPipe
+ DoiParserPipe,
+ RegionBackgroundToRgbPipe
],
exports:[
DataBrowser,
diff --git a/src/ui/databrowserModule/databrowser.service.ts b/src/ui/databrowserModule/databrowser.service.ts
index 5baa496dc..9fdf8104f 100644
--- a/src/ui/databrowserModule/databrowser.service.ts
+++ b/src/ui/databrowserModule/databrowser.service.ts
@@ -306,12 +306,6 @@ export class DatabrowserService implements OnDestroy{
}
public getModalityFromDE = getModalityFromDE
-
- public getBackgroundColorStyleFromRegion(region:any = null){
- return region && region.rgb
- ? `rgb(${region.rgb.join(',')})`
- : `white`
- }
}
diff --git a/src/ui/databrowserModule/databrowser/databrowser.component.ts b/src/ui/databrowserModule/databrowser/databrowser.component.ts
index b3568e039..9a4f53854 100644
--- a/src/ui/databrowserModule/databrowser/databrowser.component.ts
+++ b/src/ui/databrowserModule/databrowser/databrowser.component.ts
@@ -155,10 +155,6 @@ export class DataBrowser implements OnDestroy,OnInit{
resetFilters(event?:MouseEvent){
this.clearAll()
}
-
- getBackgroundColorStyleFromRegion(region:any) {
- return this.dbService.getBackgroundColorStyleFromRegion(region)
- }
}
export interface DataEntryFilter{
diff --git a/src/ui/databrowserModule/databrowser/databrowser.template.html b/src/ui/databrowserModule/databrowser/databrowser.template.html
index 515a94d83..f852c03d9 100644
--- a/src/ui/databrowserModule/databrowser/databrowser.template.html
+++ b/src/ui/databrowserModule/databrowser/databrowser.template.html
@@ -16,7 +16,7 @@
<span
*ngFor="let region of regions"
class="badge badge-secondary mr-1 mw-100">
- <span [ngStyle]="{backgroundColor:getBackgroundColorStyleFromRegion(region)}" class="dot">
+ <span [ngStyle]="{backgroundColor: (region | regionBackgroundToRgbPipe)}" class="dot">
</span>
<span class="d-inline-block mw-100 overflow-hidden text-truncate">
@@ -122,7 +122,7 @@
<span
*ngFor="let region of dataset.parcellationRegion"
class="badge badge-secondary mr-1 mw-100">
- <span [ngStyle]="{backgroundColor:getBackgroundColorStyleFromRegion(region)}" class="dot">
+ <span [ngStyle]="{backgroundColor:(region | regionBackgroundToRgbPipe)}" class="dot">
</span>
<span class="d-inline-block mw-100 overflow-hidden text-truncate">
diff --git a/src/ui/databrowserModule/util/regionBackgroundToRgb.pipe.ts b/src/ui/databrowserModule/util/regionBackgroundToRgb.pipe.ts
new file mode 100644
index 000000000..4a03cd9dc
--- /dev/null
+++ b/src/ui/databrowserModule/util/regionBackgroundToRgb.pipe.ts
@@ -0,0 +1,13 @@
+import { Pipe, PipeTransform } from "@angular/core";
+
+@Pipe({
+ name: 'regionBackgroundToRgbPipe'
+})
+
+export class RegionBackgroundToRgbPipe implements PipeTransform{
+ public transform(region = null): string{
+ return region && region.rgb
+ ? `rgb(${region.rgb.join(',')})`
+ : 'white'
+ }
+}
\ No newline at end of file
--
GitLab