Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS will be completely phased out by mid-2025. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 5f2808b2 authored by Joze RIHTARSIC's avatar Joze RIHTARSIC
Browse files

Delete extension dialog is not needed anymore

parent 3d5bfaf6
No related branches found
No related tags found
No related merge requests found
......@@ -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,
......
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) {
}
......
......@@ -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">
......
......@@ -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);
}
......
<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>
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();
});
});
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>) {
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment