From 5f2808b29d350b9878d25e96b82a99ef7a25524d Mon Sep 17 00:00:00 2001
From: Joze RIHTARSIC <joze.rihtarsic@ext.ec.europa.eu>
Date: Wed, 17 Oct 2018 10:27:31 +0200
Subject: [PATCH] Delete extension dialog is not needed anymore

---
 smp-angular/src/app/app.module.ts             |  3 --
 .../service-group-edit-controller.ts          |  9 ------
 .../service-group-edit.component.html         | 14 ----------
 .../service-group-edit.component.ts           | 14 +---------
 ...vice-group-extension-dialog.component.html | 28 -------------------
 ...e-group-extension-dialog.component.spec.ts | 25 -----------------
 ...ervice-group-extension-dialog.component.ts | 16 -----------
 7 files changed, 1 insertion(+), 108 deletions(-)
 delete mode 100644 smp-angular/src/app/service-group-edit/service-group-extension-dialog/service-group-extension-dialog.component.html
 delete mode 100644 smp-angular/src/app/service-group-edit/service-group-extension-dialog/service-group-extension-dialog.component.spec.ts
 delete mode 100644 smp-angular/src/app/service-group-edit/service-group-extension-dialog/service-group-extension-dialog.component.ts

diff --git a/smp-angular/src/app/app.module.ts b/smp-angular/src/app/app.module.ts
index 3ecf401ae..721bd6f1c 100644
--- a/smp-angular/src/app/app.module.ts
+++ b/smp-angular/src/app/app.module.ts
@@ -64,7 +64,6 @@ import {DomainSelectorComponent} from './common/domain-selector/domain-selector.
 import {AlertsComponent} from './alerts/alerts.component';
 
 import {SearchTableComponent} from './common/search-table/search-table.component';
-import {ServiceGroupExtensionDialogComponent} from './service-group-edit/service-group-extension-dialog/service-group-extension-dialog.component';
 import {ServiceGroupMetadataDialogComponent} from './service-group-edit/service-group-metadata-dialog/service-group-metadata-dialog.component';
 import {DomainDetailsDialogComponent} from './domain/domain-details-dialog/domain-details-dialog.component';
 import {UserDetailsDialogComponent} from './user/user-details-dialog/user-details-dialog.component';
@@ -88,7 +87,6 @@ import {CertificateService} from './user/certificate.service';
     IsAuthorized,
     SaveDialogComponent,
     ServiceGroupMetadataDialogComponent,
-    ServiceGroupExtensionDialogComponent,
     CancelDialogComponent,
     RowLimiterComponent,
     DatePipe,
@@ -108,7 +106,6 @@ import {CertificateService} from './user/certificate.service';
     AppComponent,
     ServiceGroupMetadataDialogComponent,
     ServiceGroupDetailsDialogComponent,
-    ServiceGroupExtensionDialogComponent,
     DomainDetailsDialogComponent,
     UserDetailsDialogComponent,
     CancelDialogComponent,
diff --git a/smp-angular/src/app/service-group-edit/service-group-edit-controller.ts b/smp-angular/src/app/service-group-edit/service-group-edit-controller.ts
index 4942ebc87..fa802d8a0 100644
--- a/smp-angular/src/app/service-group-edit/service-group-edit-controller.ts
+++ b/smp-angular/src/app/service-group-edit/service-group-edit-controller.ts
@@ -1,7 +1,6 @@
 import {SearchTableController} from '../common/search-table/search-table-controller';
 import {MatDialog, MatDialogConfig, MatDialogRef} from '@angular/material';
 import {ServiceGroupDetailsDialogComponent} from './service-group-details-dialog/service-group-details-dialog.component';
-import {ServiceGroupExtensionDialogComponent} from './service-group-extension-dialog/service-group-extension-dialog.component';
 import {ServiceGroupEditRo} from './service-group-edit-ro.model';
 import {SearchTableEntityStatus} from '../common/search-table/search-table-entity-status.model';
 import {ServiceMetadataEditRo} from "./service-metadata-edit-ro.model";
@@ -20,14 +19,6 @@ export class ServiceGroupEditController implements SearchTableController {
 
   }
 
-  public showExtension(row: any) {
-    let dialogRef: MatDialogRef<ServiceGroupExtensionDialogComponent> = this.dialog.open(ServiceGroupExtensionDialogComponent);
-    dialogRef.componentInstance.servicegroup = row;
-    dialogRef.afterClosed().subscribe(result => {
-      //Todo:
-    });
-  }
-
   public showMetadataList(row: any) {
 
   }
diff --git a/smp-angular/src/app/service-group-edit/service-group-edit.component.html b/smp-angular/src/app/service-group-edit/service-group-edit.component.html
index 379697f11..894019e35 100644
--- a/smp-angular/src/app/service-group-edit/service-group-edit.component.html
+++ b/smp-angular/src/app/service-group-edit/service-group-edit.component.html
@@ -20,15 +20,6 @@
 
   </ng-template>
 
-  <ng-template #rowExtensionAction let-row="row" let-value="value" ngx-datatable-cell-template>
-
-    <button mat-button color="primary"
-            (click)="extensionRowButtonAction(row)" id="extensionRowButtonAction{{row.$$index}}_id" tooltip="Extension">
-      <mat-icon>code</mat-icon>
-      <span>Extension</span>
-    </button>
-
-  </ng-template>
 
   <ng-template #searchPanel>
     <mat-form-field>
@@ -59,11 +50,6 @@
       <span>Metadata</span>
     </button>
 
-    <button mat-raised-button color="primary"
-            id="extensionbutton_id">
-      <mat-icon>code</mat-icon>
-      <span>Extension</span>
-    </button>
   </ng-template>
 
   <ng-template #tableRowDetailContainer let-row="row">
diff --git a/smp-angular/src/app/service-group-edit/service-group-edit.component.ts b/smp-angular/src/app/service-group-edit/service-group-edit.component.ts
index 64e4c6709..b81066cb4 100644
--- a/smp-angular/src/app/service-group-edit/service-group-edit.component.ts
+++ b/smp-angular/src/app/service-group-edit/service-group-edit.component.ts
@@ -18,7 +18,6 @@ import {SearchTableResult} from "../common/search-table/search-table-result.mode
 export class ServiceGroupEditComponent implements OnInit {
 
   @ViewChild('rowMetadataAction') rowMetadataAction: TemplateRef<any>
-  @ViewChild('rowExtensionAction') rowExtensionAction: TemplateRef<any>
   @ViewChild('rowActions') rowActions: TemplateRef<any>;
   @ViewChild('rowSMPUrlLinkAction') rowSMPUrlLinkAction: TemplateRef<any>
 
@@ -70,13 +69,6 @@ export class ServiceGroupEditComponent implements OnInit {
         name: 'Participant identifier',
         prop: 'participantIdentifier',
       },
-      {
-        cellTemplate: this.rowExtensionAction,
-        name: 'Extension',
-        width: 80,
-        maxwidth: 120,
-        sortable: false
-      },
       {
         cellTemplate: this.rowSMPUrlLinkAction,
         name: 'OASIS ServiceGroup URL',
@@ -88,14 +80,10 @@ export class ServiceGroupEditComponent implements OnInit {
     ];
 
     this.columnPicker.selectedColumns = this.columnPicker.allColumns.filter(col => {
-      return ["Metadata size", 'Owners size', "Participant scheme", "Participant identifier", "Extension", "OASIS ServiceGroup URL"].indexOf(col.name) != -1
+      return ["Metadata size", 'Owners size', "Participant scheme", "Participant identifier", "OASIS ServiceGroup URL"].indexOf(col.name) != -1
     });
   }
 
-  extensionRowButtonAction(row: any){
-    this.serviceGroupEditController.showExtension(row);
-  }
-
   metadataRowButtonAction(row: any){
     this.serviceGroupEditController.showMetadataList(row);
   }
diff --git a/smp-angular/src/app/service-group-edit/service-group-extension-dialog/service-group-extension-dialog.component.html b/smp-angular/src/app/service-group-edit/service-group-extension-dialog/service-group-extension-dialog.component.html
deleted file mode 100644
index d90e16ed6..000000000
--- a/smp-angular/src/app/service-group-edit/service-group-extension-dialog/service-group-extension-dialog.component.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<h2 mat-dialog-title>ServiceGroup Extension</h2>
-<mat-dialog-content style="height:260px;width:650px">
-  <textarea style="width: 100%; height: 95%">&lt;Extension&gt;
-    &lt;ExtensionID&gt;another sample not mandatory extension ID&lt;/ExtensionID&gt;
-    &lt;ExtensionName&gt;name&lt;/ExtensionName&gt;
-    &lt;ExtensionAgencyID&gt;sample string&lt;/ExtensionAgencyID&gt;
-    &lt;ExtensionAgencyName&gt;sample string&lt;/ExtensionAgencyName&gt;
-    &lt;ext:nextdummynode xmlns:ext="http://test2.eu"&gt;token1&lt;/ext:nextdummynode&gt;
-&lt;/Extension&gt;</textarea>
-
-</mat-dialog-content>
-
-<mat-dialog-actions>
-  <div class="group-action-button">
-    <button id="ServiceGroupsSaveButton" mat-raised-button color="primary" (click)="dialogRef.close({})"
-            style="margin-top:10px">
-      <mat-icon>save</mat-icon>
-      <span>Save</span>
-    </button>
-
-    <button id="ServiceGroupsCloseButton" mat-raised-button color="primary" (click)="dialogRef.close({})"
-            style="margin-top:10px">
-      <mat-icon>close</mat-icon>
-      <span>Close</span>
-    </button>
-  </div>
-</mat-dialog-actions>
-
diff --git a/smp-angular/src/app/service-group-edit/service-group-extension-dialog/service-group-extension-dialog.component.spec.ts b/smp-angular/src/app/service-group-edit/service-group-extension-dialog/service-group-extension-dialog.component.spec.ts
deleted file mode 100644
index 5b529ed2e..000000000
--- a/smp-angular/src/app/service-group-edit/service-group-extension-dialog/service-group-extension-dialog.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ServiceGroupExtensionDialogComponent } from './service-group-extension-dialog.component';
-
-describe('ServiceGroupExtensionDialogComponent', () => {
-  let component: ServiceGroupExtensionDialogComponent;
-  let fixture: ComponentFixture<ServiceGroupExtensionDialogComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ ServiceGroupExtensionDialogComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ServiceGroupExtensionDialogComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should be created', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/smp-angular/src/app/service-group-edit/service-group-extension-dialog/service-group-extension-dialog.component.ts b/smp-angular/src/app/service-group-edit/service-group-extension-dialog/service-group-extension-dialog.component.ts
deleted file mode 100644
index 9bebd3338..000000000
--- a/smp-angular/src/app/service-group-edit/service-group-extension-dialog/service-group-extension-dialog.component.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import {Component} from '@angular/core';
-import {MatDialogRef} from '@angular/material';
-
-@Component({
-  selector: 'servicegroup-extension-dialog',
-  templateUrl: './service-group-extension-dialog.component.html',
-})
-export class ServiceGroupExtensionDialogComponent {
-
-  servicegroup;
-  dateFormat: String = 'yyyy-MM-dd HH:mm:ssZ';
-
-  constructor(public dialogRef: MatDialogRef<ServiceGroupExtensionDialogComponent>) {
-  }
-
-}
-- 
GitLab