Skip to content

Commit

Permalink
Merged in feature/SHIBUI-559 (pull request #82)
Browse files Browse the repository at this point in the history 
SHIBUI-559: Implemented updates to copy provider

* Resolved conflict

* SHIBUI-559: Implemented updates to copy provider

Approved-by: Shibui Jenkins <shibui.jenkins@gmail.com>
Approved-by: Ryan Mathis <rmathis@unicon.net>
  • Loading branch information
@rmathis
rmathis committed Jun 8, 2018
1 parent a46d95a commit 5a1e9e5
Show file tree
Hide file tree
Showing 13 changed files with 366 additions and 259 deletions.
5 changes: 5 additions & 0 deletions ui/src/app/domain/component/i18n-text.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
11 changes: 10 additions & 1 deletion ui/src/app/metadata-provider/action/copy.action.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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;
112 changes: 58 additions & 54 deletions ui/src/app/metadata-provider/container/blank-provider.component.html
View file
Original file line number Diff line number Diff line change
@@ -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>
Loading

0 comments on commit 5a1e9e5

Please sign in to comment.