Merge branch 'master' of gitlab.lrz.de:netex/frontend

src/app/pages/explorer-page/explorer-page.component.html

@@ -651,7 +651,10 @@
             [ngClass]="{ 'text-normal': 'smallStyle' }"
           >
             <div class="card-content overflow">
-            <table class="table selection-table" *ngIf="analysis.getCount() > 0">
+              <table
+                class="table selection-table"
+                *ngIf="analysis.getCount() > 0"
+              >
                 <thead>
                   <tr>
                     <td>Label</td>
@@ -663,13 +666,31 @@
                 </thead>
                 <tbody>
                   <tr *ngFor="let p of analysis.getSelection()">
-                <td><p class="is-capitalized">{{p.data.label}}</p></td>
-                <td><p>{{myConfig.nodeGroups[p.data.group]['groupName']}}</p></td>
-                <td *ngIf="myConfig.identifier !== 'symbol'"><p>{{p.data.symbol}}</p></td>
-                <td *ngIf="myConfig.identifier !== 'uniprot'"><p>{{p.data.uniprotAc}}</p></td>
                     <td>
-                  <button (click)="analysis.removeItems([p])" class="button is-small is-danger is-outlined has-tooltip"
-                          tooltipPosition="top" pTooltip="Remove from selection.">
+                      <p class="is-capitalized">{{ p.data.label }}</p>
+                    </td>
+                    <td>
+                      <p>
+                        {{ myConfig.nodeGroups[p.data.group]["groupName"] }}
+                      </p>
+                    </td>
+                    <td *ngIf="myConfig.identifier !== 'symbol'">
+                      <p>{{ p.data.symbol }}</p>
+                    </td>
+                    <td *ngIf="myConfig.identifier !== 'uniprot'">
+                      <p>{{ p.data.uniprotAc }}</p>
+                    </td>
+                    <td>
+                      <button
+                        (click)="analysis.removeItems([p])"
+                        class="
+                          button
+                          is-small is-danger is-outlined
+                          has-tooltip
+                        "
+                        tooltipPosition="top"
+                        pTooltip="Remove from selection."
+                      >
                         <i class="fa fa-trash"></i>
                       </button>
                     </td>
@@ -726,8 +747,8 @@
               </a>
               </footer> -->
 
-            <!-- <footer class="card-footer">
-                <a (click)="analysis.invertSelection(currentViewNodes)" class="card-footer-item text-primary"
+            <footer class="card-footer">
+              <!-- <a (click)="analysis.invertSelection(currentViewNodes)" class="card-footer-item text-primary"
                   tooltipPosition="top" pTooltip="Invert the current selection.">
               <span class="icon">
                 <i class="fa fa-sync"></i>
@@ -735,17 +756,20 @@
                   <span>
                 Invert
               </span>
-                </a>
-                <a (click)="analysis.resetSelection()" class="card-footer-item text-danger"
-                  tooltipPosition="top" pTooltip="Remove all entries from the selection.">
+                </a> -->
+              <a
+                *ngIf="analysis.getSelection().length"
+                (click)="analysis.resetSelection()"
+                class="card-footer-item text-danger"
+                tooltipPosition="top"
+                pTooltip="Remove all entries from the selection."
+              >
                 <span class="icon">
                   <i class="fa fa-broom"></i>
                 </span>
-                  <span>
-                Reset
-              </span>
+                <span> Reset </span>
               </a>
-              </footer> -->
+            </footer>
 
             <!-- </div> -->
             <!-- </div>  -->

src/app/services/analysis/analysis.service.ts

@@ -209,8 +209,8 @@ export class AnalysisService {
   }*/
 
   resetSelection() {
+    this.selectListSubject.next({items: Array.from(this.selectedItems.values()), selected: false});
     this.selectedItems.clear();
-    this.selectListSubject.next({items: [], selected: null});
   }
 
   idInSelection(nodeId: string): boolean {