Merge pull request #17 from mdrillin/WizardAddition

Incorporates patternfly-ng wizard
teiid · Oct 18, 2017 · 1bb8dcb · 1bb8dcb
1 parent 2929088
commit 1bb8dcb
Show file tree

Hide file tree

Showing 33 changed files with 1,866 additions and 477 deletions.
diff --git a/ngapp/messages.xlf b/ngapp/messages.xlf
diff --git a/ngapp/package-lock.json b/ngapp/package-lock.json
diff --git a/ngapp/package.json b/ngapp/package.json
@@ -12,25 +12,25 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^4.2.4",
-    "@angular/common": "^4.2.4",
-    "@angular/compiler": "^4.2.4",
-    "@angular/core": "^4.2.4",
-    "@angular/forms": "^4.2.4",
-    "@angular/http": "^4.2.4",
-    "@angular/platform-browser": "^4.2.4",
-    "@angular/platform-browser-dynamic": "^4.2.4",
-    "@angular/router": "^4.2.4",
+    "@angular/animations": "^4.4.5",
+    "@angular/common": "^4.4.5",
+    "@angular/compiler": "^4.4.5",
+    "@angular/core": "^4.4.5",
+    "@angular/forms": "^4.4.5",
+    "@angular/http": "^4.4.5",
+    "@angular/platform-browser": "^4.4.5",
+    "@angular/platform-browser-dynamic": "^4.4.5",
+    "@angular/router": "^4.4.5",
     "core-js": "^2.4.1",
     "ngx-bootstrap": "^1.9.3",
-    "patternfly-ng": "^0.13.1",
+    "patternfly-ng": "^0.13.3",
     "rxjs": "^5.4.2",
     "zone.js": "^0.8.14"
   },
   "devDependencies": {
     "@angular/cli": "1.3.2",
-    "@angular/compiler-cli": "^4.2.4",
-    "@angular/language-service": "^4.2.4",
+    "@angular/compiler-cli": "^4.4.5",
+    "@angular/language-service": "^4.4.5",
     "@types/jasmine": "~2.5.53",
     "@types/jasminewd2": "~2.0.2",
     "@types/node": "^6.0.89",

diff --git a/ngapp/src/app/activities/activities-cards/activities-cards.component.html b/ngapp/src/app/activities/activities-cards/activities-cards.component.html
@@ -13,10 +13,10 @@ <h2 class="activity-card-title">
           </h2>
           <hr/>
           <div>
-            <span><b>Source:</b>&nbsp;&nbsp;{{ activity.getSourceConnection() }}</span>
+            <span><b i18n="@@activitiesCards.Source" >Source:</b>&nbsp;&nbsp;{{ activity.getSourceConnection() }}</span>
           </div>
           <div>
-            <span><b>Target:</b>&nbsp;&nbsp;{{ activity.getTargetConnection() }}</span>
+            <span><b i18n="@@activitiesCards.Target" >Target:</b>&nbsp;&nbsp;{{ activity.getTargetConnection() }}</span>
           </div>
           <!--
           <div class="activity-tags" *ngIf="activity.tags && activity.tags.length > 0">

diff --git a/ngapp/src/app/activities/activities-cards/activities-cards.component.ts b/ngapp/src/app/activities/activities-cards/activities-cards.component.ts
@@ -29,7 +29,7 @@ import { Output } from "@angular/core";
 })
 export class ActivitiesCardsComponent {
 
-  @Input() private activities: Activity[];
+  @Input() public activities: Activity[];
   @Input() private selectedActivities: Activity[];
   @Output() private activitySelected: EventEmitter<Activity> = new EventEmitter<Activity>();
   @Output() private activityDeselected: EventEmitter<Activity> = new EventEmitter<Activity>();

diff --git a/ngapp/src/app/activities/activities-list/activities-list.component.html b/ngapp/src/app/activities/activities-list/activities-list.component.html
@@ -15,10 +15,10 @@
         </div>
         <div class="list-view-pf-additional-info">
           <div>
-            <span><b>Source:</b>&nbsp;&nbsp;{{ activity.getSourceConnection() }}&nbsp;&nbsp;&nbsp;&nbsp;</span>
+            <span><b i18n="@@activitiesList.Source" >Source:</b>&nbsp;&nbsp;{{ activity.getSourceConnection() }}&nbsp;&nbsp;&nbsp;&nbsp;</span>
           </div>
           <div>
-            <span><b>Target:</b>&nbsp;&nbsp;{{ activity.getTargetConnection() }}</span>
+            <span><b i18n="@@activitiesList.Target" >Target:</b>&nbsp;&nbsp;{{ activity.getTargetConnection() }}</span>
           </div>
           <!--
           <div class="activity-tags" *ngIf="activity.tags && activity.tags.length > 0">

diff --git a/ngapp/src/app/activities/activities-list/activities-list.component.ts b/ngapp/src/app/activities/activities-list/activities-list.component.ts
@@ -29,7 +29,7 @@ import { Output } from "@angular/core";
 })
 export class ActivitiesListComponent {
 
-  @Input() private activities: Activity[];
+  @Input() public activities: Activity[];
   @Input() private selectedActivities: Activity[];
   @Output() private activitySelected: EventEmitter<Activity> = new EventEmitter<Activity>();
   @Output() private activityDeselected: EventEmitter<Activity> = new EventEmitter<Activity>();

diff --git a/ngapp/src/app/activities/activities.component.html b/ngapp/src/app/activities/activities.component.html
@@ -10,13 +10,13 @@
 
   <div class="container-fluid activity-list-activities" *ngIf="!pageError">
     <div class="row">
-      <h2>Activities</h2>
+      <h2 i18n="@@activities.Activities" >Activities</h2>
     </div>
     <div class="row toolbar-pf">
       <div class="col-sm-12">
         <form class="toolbar-pf-actions" (submit)="filterActivities()" #filterForm="ngForm">
           <div class="form-group toolbar-pf-filter">
-            <label class="sr-only" for="filter">Name</label>
+            <label i18n="@@activity.Name" class="sr-only" for="filter">Name</label>
             <div class="input-group" style="width: 100%">
               <input name="name-filter" [(ngModel)]="nameFilter" type="text" class="form-control name-filter" id="filter" placeholder="Filter by name...">
             </div>
@@ -28,7 +28,7 @@ <h2>Activities</h2>
             </button>
           </div>
           <div class="form-group">
-            <a class="btn btn-primary" [routerLink]="[ addActivityLink ]">Add Activity</a>
+            <a i18n="@@activities.addActivity" class="btn btn-primary" [routerLink]="[ addActivityLink ]">Add Activity</a>
           </div>
           <div class="form-group toolbar-pf-view-selector">
             <ul class="list-inline">
@@ -54,8 +54,8 @@ <h5>{{ filteredActivities.length }} Activities found
           <div class="blank-slate-pf-icon">
             <span class="pficon pficon pficon-add-circle-o"></span>
           </div>
-          <h1>No Activities Found</h1>
-          <p>
+          <h1 i18n="@@activities.noActivitiesFound" >No Activities Found</h1>
+          <p i18n="@@activities.noActivitiesFoundPleaseClick" >
             No Activities were found - please click below to create a new Activity!
           </p>
           <div class="blank-slate-pf-main-action">
@@ -68,7 +68,7 @@ <h1>No Activities Found</h1>
       <div class="col-md-8 none-matched-state" *ngIf="filteredActivities.length === 0 && isFiltered()">
         <div class="alert alert-info">
           <span class="pficon pficon-info"></span>
-          <strong>No Activities matched the filter!</strong>&nbsp;&nbsp;Please try changing your filter criteria...
+          <strong i18n="@@activities.noActivitiesMatcheFilter">No Activities matched the filter! &nbsp;Please try changing your filter criteria..</strong>&nbsp;.
         </div>
       </div>
 
@@ -78,8 +78,8 @@ <h1>No Activities Found</h1>
           <div class="row row-cards-pf">
             <div class="card-pf card-pf-accented">
               <div class="card-pf-heading">
-                <h1 class="card-pf-title">
-                  <span class="spinner spinner-xs spinner-inline"></span> Loading Activities...
+                <h1  class="card-pf-title">
+                  <span i18n="@@activities.loadingActivities" class="spinner spinner-xs spinner-inline">Loading Activities...</span>
                 </h1>
               </div>
             </div>
@@ -103,5 +103,5 @@ <h1 class="card-pf-title">
 
 </div>
 <app-confirm-delete #confirmDeleteDialog (deleteSelected)="onDeleteActivity()">
-  <p>Do you really want to delete the selected Activity?</p>
+  <p i18n="@@activities.doYouReallyWantToDelete" >Do you really want to delete the selected Activity?</p>
 </app-confirm-delete>
diff --git a/ngapp/src/app/activities/add-activity/add-activity.component.html b/ngapp/src/app/activities/add-activity/add-activity.component.html
@@ -1,13 +1,13 @@
 <div style="margin-left: 150px">
   <div id="activities-breadcrumb-bar">
     <app-breadcrumbs>
-      <li app-breadcrumb label="Activities" icon="cog" [route]="[ activitiesLink ]"></li>
-      <li app-breadcrumb label="Add Activity" icon="plus" class="active"></li>
+      <li app-breadcrumb i18n="@@addActivity.Activities" label="Activities" icon="cog" [route]="[ activitiesLink ]"></li>
+      <li app-breadcrumb i18n="@@addActivity.addActivity" label="Add Activity" icon="plus" class="active"></li>
     </app-breadcrumbs>
   </div>
   <div class="container-fluid" *ngIf="!pageError">
     <div class="row">
-      <h2>Add Activity</h2>
+      <h2 i18n="@@addActivity.addActivity">Add Activity</h2>
     </div>
     <div class="add-activity-form row">
       <app-add-activity-form (createActivity)="onCreateActivity($event)" #createActivityForm></app-add-activity-form>

diff --git a/ngapp/src/app/activities/shared/add-activity-form/add-activity-form.component.html b/ngapp/src/app/activities/shared/add-activity-form/add-activity-form.component.html
@@ -3,7 +3,7 @@ <h1>Activity Properties</h1>
   <div class="panel-body">
     <form id="create-activity-form" class="form-horizontal" (submit)="onCreateActivity()" #createActivityForm="ngForm">
       <div class="form-group">
-        <label class="col-sm-1 control-label" for="name">Name</label>
+        <label i18n="@@addActivityForm.name" class="col-sm-1 control-label" for="name">Name</label>
         <div class="col-sm-10">
           <input type="text" class="form-control" id="name" required [(ngModel)]="activityName" name="name">
         </div>
@@ -15,13 +15,13 @@ <h1>Activity Properties</h1>
         </div>
       </div>
       <div class="form-group">
-        <label class="col-sm-1 control-label" for="sourceConnection">Source Connection</label>
+        <label i18n="@@addActivity.sourceConnection" class="col-sm-1 control-label" for="sourceConnection">Source Connection</label>
         <div class="col-sm-10">
           <input type="text" class="form-control" id="sourceConnection" [(ngModel)]="activitySource" name="sourceConnection">
         </div>
       </div>
       <div class="form-group">
-        <label class="col-sm-1 control-label" for="targetConnection">Target Connection</label>
+        <label i18n="@@addActivity.targetConnection" class="col-sm-1 control-label" for="targetConnection">Target Connection</label>
         <div class="col-sm-10">
           <input type="text" class="form-control" id="targetConnection" [(ngModel)]="activityTarget" name="targetConnection">
         </div>
@@ -35,7 +35,7 @@ <h1>Activity Properties</h1>
             <span *ngIf="creatingActivity" class="spinner spinner-xs spinner-inline"></span>
             <span *ngIf="creatingActivity">Creating</span>
           </button>
-          <button class="btn btn-default" (click)="cancelAdd()">Cancel</button>
+          <button i18n="@@addActivity.cancel" class="btn btn-default" (click)="cancelAdd()">Cancel</button>
         </div>
       </div>
     </form>

diff --git a/ngapp/src/app/activities/shared/add-activity-form/add-activity-form.component.ts b/ngapp/src/app/activities/shared/add-activity-form/add-activity-form.component.ts
@@ -32,8 +32,8 @@ import { LoggerService } from "@core/logger.service";
 })
 export class AddActivityFormComponent {
 
+  public creatingActivity = false;
   private model = new NewActivity();
-  private creatingActivity = false;
   private logger: LoggerService;
   private router: Router;
 

diff --git a/ngapp/src/app/app.component.ts b/ngapp/src/app/app.component.ts
@@ -25,8 +25,8 @@ import { Component } from "@angular/core";
 })
 export class AppComponent {
 
-  private routerOutletWrapperId: string;
-  private routerOutletWrapperClass: string;
+  public routerOutletWrapperId: string;
+  public routerOutletWrapperClass: string;
 
   constructor() {
     this.routerOutletWrapperId = "studio-page-body";

diff --git a/ngapp/src/app/connections/add-connection-wizard/add-connection-wizard.component.ts b/ngapp/src/app/connections/add-connection-wizard/add-connection-wizard.component.ts
@@ -37,25 +37,25 @@ export class AddConnectionWizardComponent implements OnInit {
 
   private connectionService: ConnectionService;
   private allTemplates: TemplateDefinition[] = [];
-  private templatesLoaded = false;
-  private detailPropertiesLoaded = false;
+  public templatesLoaded = false;
+  public detailPropertiesLoaded = false;
   private basicPropertyForm: FormGroup;
   private detailProperties: Array<PropertyDefinition<any>> = [];
   private requiredPropValues: Array<[string, string]> = [];
 
-  private createComplete = true;
-  private createSuccessful = false;
+  public createComplete = true;
+  public createSuccessful = false;
 
   // Wizard Step 1
-  private step1Config: WizardStepConfig;
+  public step1Config: WizardStepConfig;
 
   // Wizard Step 2
-  private step2Config: WizardStepConfig;
+  public step2Config: WizardStepConfig;
 
   // Wizard Step 3
-  private step3Config: WizardStepConfig;
-  private step3aConfig: WizardStepConfig;
-  private step3bConfig: WizardStepConfig;
+  public step3Config: WizardStepConfig;
+  public step3aConfig: WizardStepConfig;
+  public step3bConfig: WizardStepConfig;
   private logger: LoggerService;
   private router: Router;
 

diff --git a/ngapp/src/app/connections/add-connection/add-connection.component.html b/ngapp/src/app/connections/add-connection/add-connection.component.html
@@ -1,8 +1,8 @@
 <div style="margin-left: 150px">
   <div id="connections-breadcrumb-bar">
     <app-breadcrumbs>
-      <li app-breadcrumb label="Connections" icon="plug" [route]="[ connectionsLink ]"></li>
-      <li app-breadcrumb label="Add Connection" icon="plus" class="active"></li>
+      <li i18n="@@activitiesCards.connections" app-breadcrumb label="Connections" icon="plug" [route]="[ connectionsLink ]"></li>
+      <li i18n="@@activitiesCards.addConnection" app-breadcrumb label="Add Connection" icon="plus" class="active"></li>
     </app-breadcrumbs>
   </div>
   <div class="container-fluid" *ngIf="!pageError">
@@ -15,3 +15,4 @@ <h2></h2>
     </div>
   </div>
 </div>
+
diff --git a/ngapp/src/app/connections/add-connection/add-connection.component.ts b/ngapp/src/app/connections/add-connection/add-connection.component.ts
@@ -9,6 +9,7 @@ import {ConnectionsConstants} from "@connections/shared/connections-constants";
 export class AddConnectionComponent implements OnInit {
 
   public readonly connectionsLink = ConnectionsConstants.connectionsRootPath;
+  public pageError: any = "";
 
   constructor() {
     // Nothing

diff --git a/ngapp/src/app/connections/connections-cards/connections-cards.component.html b/ngapp/src/app/connections/connections-cards/connections-cards.component.html
@@ -12,10 +12,10 @@ <h2 class="connection-card-title">
           </h2>
           <hr/>
           <div>
-            <span><b>JNDI:</b>&nbsp;&nbsp;{{ connection.getJndiName() }}</span>
+            <span><b i18n="@@connectionTagsLabel.jndi" >JNDI:</b>&nbsp;&nbsp;{{ connection.getJndiName() }}</span>
           </div>
           <div>
-            <span><b>Driver:</b>&nbsp;&nbsp;{{ connection.getDriverName() }}</span>
+            <span><b i18n="@@connectionTagsLabel.driver" >Driver:</b>&nbsp;&nbsp;{{ connection.getDriverName() }}</span>
           </div>
           <!--
           <div class="connection-tags" *ngIf="connection.tags && connection.tags.length > 0">

diff --git a/ngapp/src/app/connections/connections-cards/connections-cards.component.ts b/ngapp/src/app/connections/connections-cards/connections-cards.component.ts
@@ -26,7 +26,7 @@ import { Connection } from "@connections/shared/connection.model";
 })
 export class ConnectionsCardsComponent {
 
-  @Input() private connections: Connection[];
+  @Input() public connections: Connection[];
   @Input() private selectedConnections: Connection[];
   @Output() private connectionSelected: EventEmitter<Connection> = new EventEmitter<Connection>();
   @Output() private connectionDeselected: EventEmitter<Connection> = new EventEmitter<Connection>();

diff --git a/ngapp/src/app/connections/connections-list/connections-list.component.html b/ngapp/src/app/connections/connections-list/connections-list.component.html
@@ -15,10 +15,10 @@
         </div>
         <div class="list-view-pf-additional-info">
           <div>
-            <span><b>JNDI:</b>&nbsp;&nbsp;{{ connection.getJndiName() }}&nbsp;&nbsp;&nbsp;&nbsp;</span>
+            <span><b i18n="@@connectionsList.jndi" >JNDI:</b>&nbsp;&nbsp;{{ connection.getJndiName() }}&nbsp;&nbsp;&nbsp;&nbsp;</span>
           </div>
           <div>
-            <span><b>Driver:</b>&nbsp;&nbsp;{{ connection.getDriverName() }}</span>
+            <span><b i18n="@@connectionsList.driver" >Driver:</b>&nbsp;&nbsp;{{ connection.getDriverName() }}</span>
           </div>
           <!--
           <div class="connection-tags" *ngIf="connection.tags && connection.tags.length > 0">
@@ -31,6 +31,9 @@
       <div class="list-view-pf-actions">
         <button class="btn btn-default" type="button" (click)="onPingConnection(connection.getId())">Ping</button>
         <button class="btn btn-danger" type="button" (click)="onDeleteConnection(connection.getId())">Delete</button>
+        <button i18n="@@connectionsList.ping" class="btn btn-default" type="button" (click)="onPingConnection(connection.getId())">Ping</button>
+        <button i18n="@@connectionsList.edit" class="btn btn-default" type="button" (click)="onEditConnection(connection.getId())">Edit</button>
+        <button i18n="@@connectionsList.delete" class="btn btn-danger" type="button" (click)="onDeleteConnection(connection.getId())">Delete</button>
       </div>
     </div>
   </div>

diff --git a/ngapp/src/app/connections/connections-list/connections-list.component.ts b/ngapp/src/app/connections/connections-list/connections-list.component.ts
@@ -29,7 +29,7 @@ export class ConnectionsListComponent {
 
   private router: Router;
 
-  @Input() private connections: Connection[];
+  @Input() public connections: Connection[];
   @Input() private selectedConnections: Connection[];
   @Output() private connectionSelected: EventEmitter<Connection> = new EventEmitter<Connection>();
   @Output() private connectionDeselected: EventEmitter<Connection> = new EventEmitter<Connection>();