Merge "Audit log,resolved merge conflict"

diff --combined portal-FE-common/src/app/layout/components/tabbar/tabbar.component.html
index 1e0518b,8d3d876..d43328d
--- 1/portal-FE-common/src/app/layout/components/tabbar/tabbar.component.html
--- 2/portal-FE-common/src/app/layout/components/tabbar/tabbar.component.html
+++ b/portal-FE-common/src/app/layout/components/tabbar/tabbar.component.html
@@@ -38,7 -38,7 +38,7 @@@
    <div style="display: flex; flex-direction:column">
  
        <mat-tab-group [selectedIndex]="selected.value" (selectedIndexChange)="selected.setValue($event)"
-         (selectedTabChange)="tabChanged($event)">
+         (selectedTabChange)="tabChanged($event);auditLog($event)" >
          <mat-tab [label]="mainTab">
            <!--
              <mat-grid-list cols="5">
@@@ -68,10 -68,10 +68,10 @@@
  
          </mat-tab>
  
-         <mat-tab *ngFor="let tab of tabs; let index = index">
+         <mat-tab *ngFor="let tab of tabs; let index = index" >
            <ng-template mat-tab-label>
              {{tab.label | elipsis: 13}} &nbsp;
-             <i class="icon ion-md-close-circle" (click)="removeTab(index)"></i>
+             <i class="icon ion-md-close-circle" (click)="removeTab(index);removeAppObject(index)"></i>
            </ng-template>
  
  
@@@ -86,9 -86,9 +86,9 @@@
          <div *ngFor="let tab of tabs; let index = index"
            [style.display]='tab.active? "inline" : "none"'
            [style.position]='tab.active? "static" : "absolute"'
 -          [style.height]='tab.active? "calc(100vh)" : "calc(0vh)"'>
 +          [style.height]='tab.active? "45rem" : "45rem"'>
  
 -          <iframe id="tabframe-{{tab.label.split(' ').join('-')}}" scrolling='yes' frameBorder='0' width='100%'
 +          <iframe id="tabframe-{{tab.label.split(' ').join('-')}}-{{index}}" scrolling='yes' frameBorder='0' width='100%'
              scrolling='yes' frameBorder='0' width='100%' height='90%' [src]='tab.url'></iframe>
  
          </div>