EDELIVERY-11315 Update Property Names and Description

Update service group and service metadata labels and members.

smp-angular/src/app/app.module.ts

@@ -129,7 +129,7 @@ import {SmpWarningPanelComponent} from "./common/components/smp-warning-panel/sm
 import {ManageMembersDialogComponent} from "./common/dialogs/manage-members-dialog/manage-members-dialog.component";
 import {HttpErrorHandlerService} from "./common/error/http-error-handler.service";
 import {SmpTitledLabelComponent} from "./common/components/smp-titled-label/smp-titled-label.component";
-import {ResourceSearchComponent} from "./service-group-search/resource-search.component";
+import {ResourceSearchComponent} from "./resource-search/resource-search.component";
 import {EditResourceController} from "./edit/edit-resources/edit-resource.controller";
 import { ClipboardModule } from '@angular/cdk/clipboard';
 import {CertificateService} from "./common/services/certificate.service";

smp-angular/src/app/app.routes.ts

 import {RouterModule, Routes} from '@angular/router';
 import {LoginComponent} from './login/login.component';
-import {ResourceSearchComponent} from './service-group-search/resource-search.component';
+import {ResourceSearchComponent} from './resource-search/resource-search.component';
 import {PropertyComponent} from "./system-settings/admin-properties/property.component";
 import {UserProfileComponent} from "./user-settings/user-profile/user-profile.component";
 import {authenticationGuard} from "./guards/authentication.guard";

smp-angular/src/app/edit/edit-resources/document-wizard-dialog/document-wizard-dialog.component.html

-<h2 mat-dialog-title>ServiceGroup Extension Wizard</h2>
+<h2 mat-dialog-title>Resource Extension Wizard</h2>
 
 <mat-dialog-content [class]="'flex-dialog-content'">
   <form [formGroup]="dialogForm">

smp-angular/src/app/edit/edit-resources/subresource-document-panel/subresource-document-panel.component.ts

@@ -16,8 +16,8 @@ import {
   SubresourceDocumentWizardComponent
 } from "../subresource-document-wizard-dialog/subresource-document-wizard.component";
 import {
-  ServiceMetadataWizardRo
-} from "../subresource-document-wizard-dialog/service-metadata-wizard-edit-ro.model";
+  SubresourceWizardRo
+} from "../subresource-document-wizard-dialog/subresource-wizard-edit-ro.model";
 import {ConfirmationDialogComponent} from "../../../common/dialogs/confirmation-dialog/confirmation-dialog.component";
 
 @Component({
@@ -205,8 +205,8 @@ export class SubresourceDocumentPanelComponent implements AfterViewInit, BeforeL
 
   onShowDocumentWizardDialog() {
 
-    let serviceMetadataWizard: ServiceMetadataWizardRo = {
-      isNewServiceMetadata: false,
+    let serviceMetadataWizard: SubresourceWizardRo = {
+      isNewSubresource: false,
       participantIdentifier: this._resource.identifierValue,
       participantScheme: this._resource.identifierScheme,
       documentIdentifier: this._subresource.identifierValue,
@@ -228,7 +228,7 @@ export class SubresourceDocumentPanelComponent implements AfterViewInit, BeforeL
     });
     formRef.afterClosed().subscribe(result => {
       if (result) {
-        let smw: ServiceMetadataWizardRo = formRef.componentInstance.getCurrent();
+        let smw: SubresourceWizardRo = formRef.componentInstance.getCurrent();
         this.documentForm.controls['payload'].setValue(smw.contentXML);
         this.documentForm.controls['payload'].markAsDirty();
       }

smp-angular/src/app/edit/edit-resources/subresource-document-wizard-dialog/subresource-document-wizard.component.html

-<h2 mat-dialog-title>Service Metadata Wizard</h2>
+<h2 mat-dialog-title>Subresource Wizard</h2>
 
 <mat-dialog-content class="flex-dialog-content">
   <form [formGroup]="dialogForm">

smp-angular/src/app/edit/edit-resources/subresource-document-wizard-dialog/subresource-document-wizard.component.ts

@@ -2,7 +2,7 @@ import {Component, Inject} from '@angular/core';
 import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
 import {UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators} from "@angular/forms";
 import {HttpClient} from "@angular/common/http";
-import {ServiceMetadataWizardRo} from "./service-metadata-wizard-edit-ro.model";
+import {SubresourceWizardRo} from "./subresource-wizard-edit-ro.model";
 import {AlertMessageService} from "../../../common/alert-message/alert-message.service";
 import {GlobalLookups} from "../../../common/global-lookups";
 import {CertificateService} from "../../../common/services/certificate.service";
@@ -10,7 +10,6 @@ import {CertificateRo} from "../../../common/model/certificate-ro.model";
 
 
 @Component({
-  selector: 'service-metadata-wizard-dialog',
   templateUrl: './subresource-document-wizard.component.html',
   styleUrls: ['./subresource-document-wizard.component.css']
 })
@@ -20,8 +19,8 @@ export class SubresourceDocumentWizardComponent {
   static readonly EDIT_MODE = 'Edit ServiceMetadata XML';
   static readonly EBCORE_IDENTIFIER_PREFIX = "urn:oasis:names:tc:ebcore:partyid-type:";
 
-  isNewServiceMetadata: boolean;
-  current: ServiceMetadataWizardRo
+  isNewSubresource: boolean;
+  current: SubresourceWizardRo
     & { confirmation?: string };
   dialogForm: UntypedFormGroup;
   certificateValidationMessage: string;
@@ -37,7 +36,7 @@ export class SubresourceDocumentWizardComponent {
     private certificateService: CertificateService,
     private lookups: GlobalLookups,
   ) {
-    this.isNewServiceMetadata = this.data.isNewServiceMetadata;
+    this.isNewSubresource = this.data.isNewSubresource;
 
     this.current = {...this.data}
 
@@ -45,8 +44,8 @@ export class SubresourceDocumentWizardComponent {
       'participantIdentifier': new UntypedFormControl({value: '', disabled: true}, null),
       'participantScheme': new UntypedFormControl({value: '', disabled: true}, null),
 
-      'documentIdentifier': new UntypedFormControl({value: '', disabled: !this.isNewServiceMetadata}, [Validators.required]),
-      'documentIdentifierScheme': new UntypedFormControl({value: '', disabled: !this.isNewServiceMetadata}, null),
+      'documentIdentifier': new UntypedFormControl({value: '', disabled: !this.isNewSubresource}, [Validators.required]),
+      'documentIdentifierScheme': new UntypedFormControl({value: '', disabled: !this.isNewSubresource}, null),
       'processScheme': new UntypedFormControl({value: ''}, null),
       'processIdentifier': new UntypedFormControl({value: ''}, [Validators.required]),
 
@@ -111,7 +110,7 @@ export class SubresourceDocumentWizardComponent {
       });
   }
 
-  public getCurrent(): ServiceMetadataWizardRo {
+  public getCurrent(): SubresourceWizardRo {
 
     this.current.participantIdentifier = this.dialogForm.controls['participantIdentifier'].value;
     this.current.participantScheme = this.dialogForm.controls['participantScheme'].value;

smp-angular/src/app/edit/edit-resources/subresource-document-wizard-dialog/service-metadata-wizard-edit-ro.model.ts → smp-angular/src/app/edit/edit-resources/subresource-document-wizard-dialog/subresource-wizard-edit-ro.model.ts

 
-export interface ServiceMetadataWizardRo  {
-  isNewServiceMetadata: boolean;
+export interface SubresourceWizardRo {
+  isNewSubresource: boolean;
   participantScheme: string;
   participantIdentifier: string;
   documentIdentifierScheme: string;

smp-angular/src/app/service-group-search/resource-search-controller.ts → smp-angular/src/app/resource-search/resource-search-controller.ts

@@ -48,8 +48,8 @@ export class ResourceSearchController implements SearchTableController {
   }
 
   isRowExpanderDisabled(row: SearchTableEntity): boolean {
-    const serviceGroup = <ResourceSearchRo>row;
-    return !(serviceGroup.serviceMetadata && serviceGroup.serviceMetadata.length);
+    const resource = <ResourceSearchRo>row;
+    return !(resource.serviceMetadata && resource.serviceMetadata.length);
   }
 
   isRecordChanged(oldModel, newModel): boolean {

smp-angular/src/app/service-group-search/resource-search.component.html → smp-angular/src/app/resource-search/resource-search.component.html

@@ -6,14 +6,14 @@
   [additionalToolButtons]="additionalToolButtons"
   [searchPanel]="searchPanel"
   [filter]="filter"
-  [searchTableController]="serviceGroupSearchController"
+  [searchTableController]="resourceSearchController"
   [tableRowDetailContainer]="tableRowDetailContainer"
   [showActionButtons]="false"
   [showIndexColumn]="true"
 >
   <ng-template #rowSMPUrlLinkAction let-row="row" let-value="value" ngx-datatable-cell-template>
     <a target="_blank"
-       href="{{contextPath}}{{createServiceGroupURL(row)}}">Open URL</a>
+       href="{{contextPath}}{{createResourceURL(row)}}">Open URL</a>
   </ng-template>
 
 

smp-angular/src/app/service-group-search/resource-search.component.ts → smp-angular/src/app/resource-search/resource-search.component.ts

@@ -30,7 +30,7 @@ export class ResourceSearchComponent implements OnInit, AfterViewInit, AfterView
   @ViewChild('searchTable', {static: true}) searchTable: SearchTableComponent;
 
   columnPicker: ColumnPicker = new ColumnPicker();
-  serviceGroupSearchController: ResourceSearchController;
+  resourceSearchController: ResourceSearchController;
   filter: any = {};
   contextPath: string = location.pathname.substring(0, location.pathname.length - 3); // remove /ui s
   baseUrl: string;
@@ -42,11 +42,11 @@ export class ResourceSearchComponent implements OnInit, AfterViewInit, AfterView
               public dialog: MatDialog,
               private changeDetector: ChangeDetectorRef) {
 
-    this.baseUrl = SmpConstants.REST_PUBLIC_SEARCH_SERVICE_GROUP;
+    this.baseUrl = SmpConstants.REST_PUBLIC_SEARCH_RESOURCE;
   }
 
   ngOnInit(): void {
-    this.serviceGroupSearchController = new ResourceSearchController(this.dialog);
+    this.resourceSearchController = new ResourceSearchController(this.dialog);
   }
 
   initColumns(): void {
@@ -102,7 +102,7 @@ export class ResourceSearchComponent implements OnInit, AfterViewInit, AfterView
     this.initColumns();
   }
 
-  createServiceGroupURL(row: ResourceSearchRo) {
+  createResourceURL(row: ResourceSearchRo) {
 
     return (!row?.domainCode? "" : row.domainCode+ '/')
           + (!row?.resourceDefUrlSegment?"" : row.resourceDefUrlSegment + '/')
@@ -111,7 +111,7 @@ export class ResourceSearchComponent implements OnInit, AfterViewInit, AfterView
 
   createServiceMetadataURL(row: ResourceSearchRo, rowSMD: SubresourceSearchRo) {
 
-    return this.createServiceGroupURL(row)
+    return this.createResourceURL(row)
             + '/' + rowSMD.subresourceDefUrlSegment + '/'
             + encodeURIComponent((!rowSMD.documentIdentifierScheme ? '' : rowSMD.documentIdentifierScheme) + '::' + rowSMD.documentIdentifier);
   }
@@ -119,7 +119,7 @@ export class ResourceSearchComponent implements OnInit, AfterViewInit, AfterView
 
 
   details(row: any) {
-    this.serviceGroupSearchController.showDetails(row);
+    this.resourceSearchController.showDetails(row);
 
   }
 }

smp-angular/src/app/smp.constants.ts

@@ -28,7 +28,6 @@ export class SmpConstants {
   public static readonly PATH_PARAM_CERT_ALIAS = '{cert-alias}';
   public static readonly PATH_PARAM_ENC_CREDENTIAL_ID = '{credential-id}';
   public static readonly PATH_PARAM_ENC_MANAGED_USER_ID = '{managed-user-id}';
-  public static readonly PATH_PARAM_SRV_GROUP_ID = '{service-group-id}';
 
   public static readonly PATH_PARAM_KEYSTORE_PWD = '{keystore-pwd}';
   public static readonly PATH_PARAM_KEYSTORE_TYPE = '{keystore-type}';
@@ -70,7 +69,7 @@ export class SmpConstants {
   public static readonly REST_EDIT_SUBRESOURCE_CREATE = SmpConstants.REST_EDIT_SUBRESOURCE  + '/' + SmpConstants.PATH_ACTION_CREATE;
 
   /* Public services */
-  public static readonly REST_PUBLIC_SEARCH_SERVICE_GROUP = SmpConstants.REST_PUBLIC + SmpConstants.PATH_ACTION_SEARCH;
+  public static readonly REST_PUBLIC_SEARCH_RESOURCE = SmpConstants.REST_PUBLIC + SmpConstants.PATH_ACTION_SEARCH;
 
   public static readonly REST_PUBLIC_DOMAIN = SmpConstants.REST_PUBLIC + SmpConstants.PATH_RESOURCE_TYPE_DOMAIN;
   /* Public edit services */

smp-angular/src/app/system-settings/admin-domain/domain-sml-panel/domain-sml-integration-panel.component.ts

@@ -209,7 +209,7 @@ export class DomainSmlIntegrationPanelComponent implements BeforeLeaveGuard {
     this.dialog.open(ConfirmationDialogComponent, {
       data: {
         title: "Register domain to SML",
-        description: "Action will register domain: [" + this._domain?.domainCode + "] and all its service groups to SML. <br/><br/>Do you wish to continue?"
+        description: "Action will register domain: [" + this._domain?.domainCode + "] and all its resources to SML. <br/><br/>Do you wish to continue?"
       }
     }).afterClosed().subscribe(result => {
       if (result) {