Merge branch 'master' into SHIBUI-519

TIER · Jun 11, 2018 · 444942d · 444942d
2 parents 3822d8b + dbe6d58
commit 444942d
Show file tree

Hide file tree

Showing 15 changed files with 373 additions and 260 deletions.
diff --git a/...rnet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy b/...rnet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy
@@ -106,6 +106,10 @@ class IncommonJPAMetadataResolverServiceImplTests extends Specification {
                 def mr = new TestObjectGenerator(attributeUtility).fileBackedHttpMetadataResolver()
                 mr.setName("HTTPMetadata")
                 metadataResolverRepository.save(mr)
+
+                mr = new TestObjectGenerator(attributeUtility).buildDynamicHttpMetadataResolver()
+                mr.name = "DynamicHttpMetadata"
+                metadataResolverRepository.save(mr)
             }
 
             return resolver

diff --git a/gradle.properties b/gradle.properties
@@ -10,4 +10,6 @@ spring-boot.version=2.0.0.RELEASE
 
 hibernate.version=5.2.11.Final
 
-lucene.version=7.2.1
+lucene.version=7.2.1
+
+org.gradle.jvmargs=-Xmx4g  XX:-UseGCOverheadLimit
diff --git a/ui/src/app/domain/component/i18n-text.component.html b/ui/src/app/domain/component/i18n-text.component.html
@@ -15,6 +15,11 @@
     <ng-container *ngSwitchCase="'signing'" i18n="@@label--signing">Signing</ng-container>
     <ng-container *ngSwitchCase="'encryption'" i18n="@@label--encryption">Encryption</ng-container>
     <ng-container *ngSwitchCase="'both'" i18n="@@label--both">Both</ng-container>
+    <!-- copy attribute sections-->
+    <ng-container *ngSwitchCase="'spSsoDescriptorInfo'" i18n="@@label--sp-sso-descriptor-info">SP SSO Descriptor Information</ng-container>
+    <ng-container *ngSwitchCase="'organizationInfo'" i18n="@@label--sp-sso-descriptor-info">Organization Information</ng-container>
+    <ng-container *ngSwitchCase="'uiMduiInfo'" i18n="@@label--ui-mdui-info">User Interface / MDUI Information</ng-container>
+    <ng-container *ngSwitchCase="'securityDescriptorInfo'" i18n="@@label--security-descriptor-info">Security Descriptor Information</ng-container>
     <!-- entity attributes -->
     <ng-container *ngSwitchCase="'entityId'" i18n="@@label--entity-id">Entity ID</ng-container>
     <ng-container *ngSwitchCase="'serviceProviderName'" i18n="@@label--service-provider-name">Service Provider Name</ng-container>

diff --git a/ui/src/app/metadata-provider/action/copy.action.ts b/ui/src/app/metadata-provider/action/copy.action.ts
@@ -8,6 +8,8 @@ export enum CopySourceActionTypes {
 
     UPDATE_PROVIDER_COPY = '[Copy Provider] Update Provider Copy Request',
 
+    UPDATE_PROVIDER_COPY_SECTIONS = '[Copy Provider] Update Provider Sections',
+
     SAVE_PROVIDER_COPY_REQUEST = '[Copy Provider] Save Provider Copy Request',
     SAVE_PROVIDER_COPY_SUCCESS = '[Copy Provider] Save Provider Copy Request',
     SAVE_PROVIDER_COPY_ERROR = '[Copy Provider] Save Provider Copy Request',
@@ -37,8 +39,15 @@ export class UpdateProviderCopy implements Action {
     constructor(public payload: Partial<MetadataProvider>) { }
 }
 
+export class UpdateProviderCopySections implements Action {
+    readonly type = CopySourceActionTypes.UPDATE_PROVIDER_COPY_SECTIONS;
+
+    constructor(public payload: string[]) { }
+}
+
 export type CopySourceActionUnion =
     | CreateProviderCopyRequest
     | CreateProviderCopySuccess
     | CreateProviderCopyError
-    | UpdateProviderCopy;
+    | UpdateProviderCopy
+    | UpdateProviderCopySections;
diff --git a/ui/src/app/metadata-provider/container/blank-provider.component.html b/ui/src/app/metadata-provider/container/blank-provider.component.html
@@ -1,55 +1,59 @@
-<form [formGroup]="providerForm" role="form">
-    <ul class="nav nav-wizard m-3">
-        <li class="nav-item">
-            <h3 class="tag tag-primary">
-                <span class="index">1</span>
-                <ng-container i18n="@@label--name-and-entityid">1. Name and EntityId</ng-container>
-            </h3>
-        </li>
-        <li class="nav-item">
-            <button class="nav-link next btn clearfix" (click)="next()" [disabled]="providerForm.invalid" aria-label="Next: Step 2, Organization information" role="button">
-                <span class="label pull-left">
-                    2.
-                    <ng-container i18n="@@label--org-info">Organization Information</ng-container>
-                </span>
-                <span class="direction pull-right">
-                    <i class="fa fa-fw fa-arrow-circle-right d-block fa-2x"></i>
+<div class="row">
+    <div class="col col-xl-6 col-lg-9 col-xs-12">
+        <form [formGroup]="providerForm" role="form">
+            <ul class="nav nav-wizard m-3">
+                <li class="nav-item">
+                    <h3 class="tag tag-primary">
+                        <span class="index">1</span>
+                        <ng-container i18n="@@label--name-and-entityid">1. Name and EntityId</ng-container>
+                    </h3>
+                </li>
+                <li class="nav-item">
+                    <button class="nav-link next btn clearfix" (click)="next()" [disabled]="providerForm.invalid" aria-label="Next: Step 2, Organization information" role="button">
+                        <span class="label pull-left">
+                            2.
+                            <ng-container i18n="@@label--org-info">Organization Information</ng-container>
+                        </span>
+                        <span class="direction pull-right">
+                            <i class="fa fa-fw fa-arrow-circle-right d-block fa-2x"></i>
+                            <ng-container i18n="@@action--next">Next</ng-container>
+                        </span>
+                    </button>
+                </li>
+            </ul>
+            <fieldset class="bg-light border rounded p-4">
+                <div class="form-group">
+                    <label for="serviceProviderName">
+                        <ng-container i18n="@@label--service-provider-name-dashboard-display-only">Service Provider Name (Dashboard Display Only)</ng-container>
+                        <i class="fa fa-fw fa-asterisk text-danger" aria-hidden="true"></i>
+                    </label>
+                    <input id="serviceProviderName" type="text" class="form-control" placeholder="" formControlName="serviceProviderName" />
+                    <ng-container *ngIf="providerForm.get('serviceProviderName').touched && providerForm.get('serviceProviderName').invalid">
+                        <small class="form-text text-danger" *ngIf="providerForm.get('serviceProviderName').hasError('required')">
+                            <ng-container i18n="@@message--service-provider-name-required">Service Provider Name is required</ng-container>
+                        </small>
+                    </ng-container>
+                </div>
+                <div class="form-group">
+                    <label for="entityId">
+                        <ng-container i18n="@@label--service-provider-entity-id">Service Provider Entity ID</ng-container>
+                        <i class="fa fa-fw fa-asterisk text-danger" aria-hidden="true"></i>
+                    </label>
+                    <input id="entityId" type="text" class="form-control" placeholder="" formControlName="entityId" />
+                    <ng-container *ngIf="providerForm.get('entityId').touched && providerForm.get('entityId').invalid">
+                        <small class="form-text text-danger" *ngIf="providerForm.get('entityId').hasError('required')">
+                            <ng-container i18n="@@message--entity-id-required">Entity ID is required</ng-container>
+                        </small>
+                    </ng-container>
+                    <small class="form-text text-danger" *ngIf="providerForm.get('entityId').hasError('unique')">
+                        <ng-container i18n="@@message--entity-id-must-be-unique">Entity ID must be unique</ng-container>
+                    </small>
+                </div>
+                <button type="submit" class="btn btn-primary sr-only" [disabled]="providerForm.invalid">
                     <ng-container i18n="@@action--next">Next</ng-container>
-                </span>
-            </button>
-        </li>
-    </ul>
-    <fieldset class="bg-light border rounded p-4">
-        <div class="form-group">
-            <label for="serviceProviderName">
-                <ng-container i18n="@@label--service-provider-name-dashboard-display-only">Service Provider Name (Dashboard Display Only)</ng-container>
-                <i class="fa fa-fw fa-asterisk text-danger" aria-hidden="true"></i>
-            </label>
-            <input id="serviceProviderName" type="text" class="form-control" placeholder="" formControlName="serviceProviderName" />
-            <ng-container *ngIf="providerForm.get('serviceProviderName').touched && providerForm.get('serviceProviderName').invalid">
-                <small class="form-text text-danger" *ngIf="providerForm.get('serviceProviderName').hasError('required')">
-                    <ng-container i18n="@@message--service-provider-name-required">Service Provider Name is required</ng-container>
-                </small>
-            </ng-container>
-        </div>
-        <div class="form-group">
-            <label for="entityId">
-                <ng-container i18n="@@label--service-provider-entity-id">Service Provider Entity ID</ng-container>
-                <i class="fa fa-fw fa-asterisk text-danger" aria-hidden="true"></i>
-            </label>
-            <input id="entityId" type="text" class="form-control" placeholder="" formControlName="entityId" />
-            <ng-container *ngIf="providerForm.get('entityId').touched && providerForm.get('entityId').invalid">
-                <small class="form-text text-danger" *ngIf="providerForm.get('entityId').hasError('required')">
-                    <ng-container i18n="@@message--entity-id-required">Entity ID is required</ng-container>
-                </small>
-            </ng-container>
-            <small class="form-text text-danger" *ngIf="providerForm.get('entityId').hasError('unique')">
-                <ng-container i18n="@@message--entity-id-must-be-unique">Entity ID must be unique</ng-container>
-            </small>
-        </div>
-        <button type="submit" class="btn btn-primary sr-only" [disabled]="providerForm.invalid">
-            <ng-container i18n="@@action--next">Next</ng-container>
-            <i class="fa fa-fw fa-arrow-circle-right fa-lg"></i>
-        </button>
-    </fieldset>
-</form>
+                    <i class="fa fa-fw fa-arrow-circle-right fa-lg"></i>
+                </button>
+            </fieldset>
+        </form>
+    </div>
+</div>