merge conflicts

1fd96407 · Michael Hartung · 6ba84635 · dbf76f6b · 1fd96407 · 1fd96407
Commit 1fd96407 authored 3 years ago by Michael Hartung
--- a/angular.json
+++ b/angular.json
@@ -54,6 +54,33 @@
                }
              ]
            },
+            "uhh-production": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.uhh.ts"
+                }
+              ],
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "namedChunks": false,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb",
+                  "maximumError": "500kb"
+                }
+              ]
+            },
            "remote": {
              "optimization": true,
              "outputHashing": "all",

--- a/drugstone-test.html
+++ b/drugstone-test.html
-<!doctype html>
 <html lang="en">
  <head>
    <link rel="stylesheet" type="text/css" href="src/theme.css">
-    <script src="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@0.7.1-rc1/remote/drugsTone.js"></script>
+    <script src="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@0.7.9-rc3/uhh/drugsTone.js"></script>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@0.7.1-rc1/remote/styles.css">
+<!--    <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/AndiMajore/drugstone-releases@0.7.9-rc3/uhh/styles.css">-->
+    <link rel="stylesheet" type="text/css"  href="./drugsTone-build/styles.css">
  </head>
  <body>
    <div style="height: 700px; width: 1300px;">
      <network-expander
-        id='drugstone-panel-1'
+        id='example-drugst.one'
-        config='{"nodeGroups":{"0.5":{"type":"gene","color":"#CCFF33FF","groupName":"0.5","shape":"star"},"1.5":{"type":"gene","color":"#66FF33FF","groupName":"1.5","shape":"circle"},"2.0":{"type":"gene","color":"#33CC33FF","groupName":"2.0","shape":"circle"},"patientGroup":{"type":"gene","color":"#FF0000FF","groupName":"Patients","shape":"circle"}},"edgeGroups":{"normal":{"color":"black","groupName":"Custom Group"},"dashed":{"color":"#000857","groupName":"Dashed","dashes":[3,2]}},"identifier":"symbol","legendUrl":"https://exbio.wzw.tum.de/covex/assets/leg1.png"}'
+        config='{"nodeGroups":{"patient":{"type":"patient","color":"#000000","font":{"color":"#f0f0f0"},"groupName":"Patient","shape":"image","image":"https://static.thenounproject.com/png/22780-200.png","shadow":true},"condition":{"type":"condition","color":"#000000","font":{"color":"#f0f0f0"},"groupName":"Condition","shape":"text","shadow":false},"important":{"type":"gene","color":"#ff881f","font":{"color":"#f0f0f0"},"groupName":"Important Gene","shape":"star","shadow":true},"gene":{"type":"gene","color":"#4da300","font":{"color":"#f0f0f0"},"groupName":"Gene","shape":"circle","shadow":true}},"edgeGroups":{"genotype":{"color":"white","groupName":"Relevant Gene","shadow":false},"has-condition":{"color":"white","groupName":"Has Condition","dashes":[2,2],"shadow":false},"ggi":{"color":"#ffffff","groupName":"Interaction","dashes":[3,2],"shadow":false}},"identifier":"symbol","title":"Breast cancer example network","nodeShadow":false,"edgeShadow":false,"showLegend":true}'
-        network='{"nodes":[{"id":"TP53","group":"0.5","x":4,"y":6},{"id":"C5","group":"0.5","x":6,"y":4},{"id":"Patient","group":"patientGroup"},{"label":"PTEN","id":"PTEN","group":0.5}],"edges":[{"from":"TP53","to":"C5","group":"dashed"},{"from":"TP53","to":"PTEN","group":"dashed"},{"from":"Patient","to":"C5","group":"normal"},{"from":"Patient","to":"PTEN","group":"normal"}]}'>
+        network='{"nodes":[{"id":"patient-1","group":"patient","x":592,"y":446},{"id":"patient-2","group":"patient","x":235,"y":87},{"id":"patient-3","group":"patient","x":105,"y":369},{"id":"ATM","label":"ATM","group":"gene","x":289,"y":242},{"id":"BARD1","label":"BARD1","group":"gene","x":44,"y":250},{"id":"BRCA1","label":"BRCA1","group":"gene","x":466,"y":576},{"id":"BRCA2","label":"BRCA2","group":"gene","x":507,"y":285},{"id":"BRIP1","label":"BRIP1","group":"gene","x":54,"y":474},{"id":"CHEK2","label":"CHEK2","group":"gene","x":216,"y":590},{"id":"CDH1","label":"CDH1","group":"gene","x":320,"y":-57},{"id":"NF1","label":"NF1","group":"gene","x":481,"y":111},{"id":"NBN","label":"NBN","group":"gene","x":-57,"y":314},{"id":"PALB2","label":"PALB2","group":"gene","x":450,"y":190},{"id":"PTEN","label":"PTEN","group":"important","x":305,"y":494},{"id":"RAD51C","label":"RAD51C","group":"gene","x":182,"y":-90},{"id":"RAD51D","label":"RAD51D","group":"gene","x":368,"y":73},{"id":"STK11","label":"STK11","group":"gene","x":686,"y":330},{"id":"TP53","label":"TP53","group":"important","x":333,"y":316},{"id":"subtype-1","label":"Subtype 1","group":"condition","x":556,"y":171},{"id":"subtype-2","label":"Subtype 2","group":"condition","x":-87,"y":221}],"edges":[{"from":"BRCA1","to":"BRCA2","group":"ggi"},{"from":"ATM","to":"BARD1","group":"ggi"},{"from":"BRCA1","to":"CHEK2","group":"ggi"},{"from":"RAD51C","to":"RAD51D","group":"ggi"},{"from":"STK11","to":"TP53","group":"ggi"},{"from":"TP53","to":"PALB2","group":"ggi"},{"from":"TP53","to":"RAD51D","group":"ggi"},{"from":"TP53","to":"NF1","group":"ggi"},{"from":"TP53","to":"BRCA1","group":"ggi"},{"from":"TP53","to":"BRCA2","group":"ggi"},{"from":"PTEN","to":"BRCA1","group":"ggi"},{"from":"PTEN","to":"BRCA2","group":"ggi"},{"from":"TP53","to":"PTEN","group":"ggi"},{"from":"ATM","to":"PTEN","group":"ggi"},{"from":"CDH1","to":"RAD51D","group":"ggi"},{"from":"CDH1","to":"PALB2","group":"ggi"},{"from":"NBN","to":"BRIP1","group":"ggi"},{"from":"BRIP1","to":"PTEN","group":"ggi"},{"from":"patient-1","to":"BRCA1","group":"genotype"},{"from":"patient-1","to":"TP53","group":"genotype"},{"from":"patient-1","to":"BRCA2","group":"genotype"},{"from":"patient-1","to":"PTEN","group":"genotype"},{"from":"patient-2","to":"TP53","group":"genotype"},{"from":"patient-2","to":"NF1","group":"genotype"},{"from":"patient-2","to":"BARD1","group":"genotype"},{"from":"patient-3","to":"TP53","group":"genotype"},{"from":"patient-3","to":"PTEN","group":"genotype"},{"from":"patient-3","to":"NBN","group":"genotype"},{"from":"patient-1","to":"subtype-1","group":"has-condition"},{"from":"patient-2","to":"subtype-1","group":"has-condition"},{"from":"patient-3","to":"subtype-2","group":"has-condition"}]}'>
      </network-expander>
    </div>
 </body>

--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
    "lint": "ng lint && htmlhint",
    "e2e": "ng e2e",
    "build-prod": "ng build --configuration=production --output-hashing=none",
+    "build-uhh": "ng build --configuration=uhh-production --output-hashing=none",
    "build-dev": "ng build --configuration=development --output-hashing=none",
    "build-remote": "ng build --configuration=remote --output-hashing=none",
    "package-es5": "cd dist/netex && cat runtime-es5.js polyfills-es5.js main-es5.js > bundle-es5.js",
@@ -18,7 +19,9 @@
    "bundle": "npm run build-prod netex && npm run package-es5 && npm run package-es2015",
    "build:netex": "npm run build-prod netex && node build-netex.js",
    "build:netex-dev": "npm run build-dev netex && node build-netex.js",
-    "build:netex-remote": "npm run build-remote netex && node build-netex.js && npm run prefixcss",
+    "build:netex-uhh": "npm run build-uhh netex && node build-netex.js",
+    "build:netex-remote": "npm run build-remote netex && node build-netex.js",
+    "prefix": "bash prefix_styles.sh" ,
    "prefixcss": "postcss -r drugsTone-build/styles.css"
  },
  "private": true,

--- a/postcss.config.js
+++ b/postcss.config.js
 module.exports = {
  plugins: [
    // require('postcss-prefixer')({prefix: "drgstn--"}),
-    require('postcss-prefix-selector')({prefix: "network-expander"})
+    require('postcss-prefix-selector')({prefix: "#appWindow"})
  ],
 }
--- a/releases/release_tag.sh
+++ b/releases/release_tag.sh
@@ -21,24 +21,30 @@ echo "Cloning Release Repo..."
 git clone git@github.com:AndiMajore/drugstone-releases.git
 echo "Updating Repo..."
-echo "Building release..."
+#echo "Building release..."
+#cd frontend || exit
+#npm run build:netex
+#cd ../
+#cp frontend/drugsTone-build/* drugstone-releases/releases/
+#
+#echo "Building dev..."
+#cd frontend || exit
+#npm run build:netex-dev
+#cd ../
+#cp frontend/drugsTone-build/* drugstone-releases/dev/
+#
+#echo "Building remote..."
+#cd frontend || exit
+#npm run build:netex-remote
+#cd ../
+#cp frontend/drugsTone-build/* drugstone-releases/remote/
+echo "Building v-server..."
 cd frontend || exit
-npm run build:netex
+npm run build:netex-uhh
 cd ../
-cp frontend/drugsTone-build/* drugstone-releases/releases/
+cp frontend/drugsTone-build/* drugstone-releases/uhh/
-echo "Building dev..."
-cd frontend || exit
-npm run build:netex-dev
-cd ../
-cp frontend/drugsTone-build/* drugstone-releases/dev/
-echo "Building remote..."
-cd frontend || exit
-npm run build:netex-remote
-cd ../
-cp frontend/drugsTone-build/* drugstone-releases/remote/
 cd drugstone-releases || echo "Error!" exit
 git commit -am "$VERSION commit: $MESSAGE"

--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -33,7 +33,7 @@ import {faTimes, faAngleUp, faAngleLeft, faCapsules, faCrosshairs, faFlask, faCh
  faExpand, faInfo, faRocket, faAngleDown, faSearch, faFastForward, faExternalLinkAlt, faTasks, faFilter,
  faMinus, faUpload, faAngleDoubleDown, faSync, faBroom, faAngleDoubleUp
 } from '@fortawesome/free-solid-svg-icons';
-import {TooltipModule} from "primeng/tooltip";
+import {TooltipModule} from 'primeng/tooltip';
 @NgModule({
  declarations: [

--- a/src/app/pages/explorer-page/explorer-page.component.html
+++ b/src/app/pages/explorer-page/explorer-page.component.html
--- a/src/app/pages/explorer-page/explorer-page.component.scss
+++ b/src/app/pages/explorer-page/explorer-page.component.scss
@@ -24,7 +24,7 @@
 }
 .explorer-network-view-settings {
-  // remove margin from tab header when network is displayed, so that network 
+  // remove margin from tab header when network is displayed, so that network
  // does not disappear in empty border
  padding: 0;
  height: calc(100% - #{$network-header-height});
@@ -74,3 +74,4 @@
  padding: 0.5rem;
 }
--- a/src/app/pages/explorer-page/explorer-page.component.ts
+++ b/src/app/pages/explorer-page/explorer-page.component.ts
 import {
  AfterViewInit,
  Component,
-  ElementRef, HostListener, Input,
+  ElementRef,
+  HostListener,
+  Input,
  OnInit,
-  ViewChild
+  ViewChild,
+  ViewEncapsulation
 } from '@angular/core';
 import {
-  NodeInteraction,
+  getDrugNodeId,
-  Node,
-  Wrapper,
  getWrapperFromNode,
-  Tissue,
+  legendContext,
+  Node,
  NodeAttributeMap,
-  getDrugNodeId,
+  NodeInteraction,
-  Drug,
+  Tissue,
-  legendContext
+  Wrapper
 } from '../../interfaces';
 import {mapCustomEdge, mapCustomNode, ProteinNetwork} from '../../main-network';
 import {AnalysisService} from '../../services/analysis/analysis.service';
@@ -23,9 +25,8 @@ import domtoimage from 'dom-to-image';
 import {NetworkSettings} from '../../network-settings';
 import {defaultConfig, EdgeGroup, IConfig, InteractionDatabase, NodeGroup} from '../../config';
 import {NetexControllerService} from 'src/app/services/netex-controller/netex-controller.service';
-import {removeDuplicateObjectsFromList, rgbaToHex, rgbToHex, standardize_color} from '../../utils'
+import {removeDuplicateObjectsFromList} from '../../utils'
 import * as merge from 'lodash/fp/merge';
-import { config } from 'rxjs';
 // import * as 'vis' from 'vis-network';
 // import {DataSet} from 'vis-data';
@@ -280,7 +281,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
    // at this point, we have nodes synched with the backend
    // use netexIds where posssible, but use original id as node name if no label given
    const nodeIdMap = {};
    network.nodes.forEach((node) => {
      // set node label to original id before node id will be set to netex id
      node.label = node.label ? node.label : node.id;
@@ -289,7 +290,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
      node.id = nodeIdMap[node.id];
    });
-    // adjust edge labels accordingly and filter 
+    // adjust edge labels accordingly and filter
    const edges = new Array();
    network.edges.forEach(edge => {
      edge.from = nodeIdMap[edge.from];

--- a/src/environments/environment.prod.uhh.ts
+++ b/src/environments/environment.prod.uhh.ts
+export const environment = {
+  production: true,
+  backend: 'http://ml-s-zbhdock2.ad.uni-hamburg.de/drugstone_api/',
+};