Merge "CBA Blueprint Wizard"
diff --git a/cds-ui/client/src/app/common/shared/shared.module.ts b/cds-ui/client/src/app/common/shared/shared.module.ts
index 531327d..2b3c993 100644
--- a/cds-ui/client/src/app/common/shared/shared.module.ts
+++ b/cds-ui/client/src/app/common/shared/shared.module.ts
@@ -35,7 +35,8 @@
],
exports: [
HomeComponent,
- CBAWizardComponent
+ CBAWizardComponent,
+ FileuploadComponent
],
imports: [
CommonModule,
diff --git a/cds-ui/client/src/app/feature-modules/blueprint/blueprint.component.html b/cds-ui/client/src/app/feature-modules/blueprint/blueprint.component.html
index 68d0ade..31c7a6a 100644
--- a/cds-ui/client/src/app/feature-modules/blueprint/blueprint.component.html
+++ b/cds-ui/client/src/app/feature-modules/blueprint/blueprint.component.html
@@ -16,5 +16,33 @@
See the License for the specific language governing permissions and
limitations under the License.
============LICENSE_END============================================ -->
-<app-cbawizard [appName]="appName"></app-cbawizard>
-<router-outlet></router-outlet>
+<!-- <app-cbawizard [appName]="appName"></app-cbawizard>
+<router-outlet></router-outlet> -->
+<mat-card class="CBAform">
+ <mat-card-content>
+ <mat-horizontal-stepper [linear]="isLinear" #stepper>
+ <mat-step [stepControl]="firstFormGroup">
+ <ng-template matStepLabel>CBA Metadata</ng-template>
+ <app-select-template></app-select-template>
+ <div>
+ <button mat-button matStepperNext style="color:white;background:gray">Proceed</button>
+ </div>
+ </mat-step>
+ <mat-step [stepControl]="secondFormGroup">
+ <ng-template matStepLabel>Controller Blueprint Designer</ng-template>
+ <app-modify-template></app-modify-template>
+ <div style="position:relative">
+ <button mat-button matStepperNext style="color:white;background:gray; right: 20px; position: absolute;bottom:5px; ">Proceed</button>
+ </div>
+ </mat-step>
+ <mat-step [stepControl]="thirdFormGroup">
+ <ng-template matStepLabel>Test</ng-template>
+ <app-test-template></app-test-template>
+ </mat-step>
+ <mat-step [stepControl]="thirdFormGroup">
+ <ng-template matStepLabel>Test</ng-template>
+ <app-deploy-template></app-deploy-template>
+ </mat-step>
+ </mat-horizontal-stepper>
+ </mat-card-content>
+ </mat-card>
diff --git a/cds-ui/client/src/app/feature-modules/blueprint/deploy-template/deploy-template.module.ts b/cds-ui/client/src/app/feature-modules/blueprint/deploy-template/deploy-template.module.ts
index d1c1259..e39beac 100644
--- a/cds-ui/client/src/app/feature-modules/blueprint/deploy-template/deploy-template.module.ts
+++ b/cds-ui/client/src/app/feature-modules/blueprint/deploy-template/deploy-template.module.ts
@@ -27,6 +27,9 @@
declarations: [
DeployTemplateComponent
],
+ exports: [
+ DeployTemplateComponent
+ ],
imports: [
CommonModule,
DeployTemplateRoutingModule
diff --git a/cds-ui/client/src/app/feature-modules/blueprint/modify-template/modify-template.module.ts b/cds-ui/client/src/app/feature-modules/blueprint/modify-template/modify-template.module.ts
index 6175208..f502de4 100644
--- a/cds-ui/client/src/app/feature-modules/blueprint/modify-template/modify-template.module.ts
+++ b/cds-ui/client/src/app/feature-modules/blueprint/modify-template/modify-template.module.ts
@@ -25,7 +25,10 @@
@NgModule({
declarations: [
- ModifyTemplateComponent
+ ModifyTemplateComponent
+ ],
+ exports: [
+ ModifyTemplateComponent
],
imports: [
CommonModule,
diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/metadata/metadata.component.html b/cds-ui/client/src/app/feature-modules/blueprint/select-template/metadata/metadata.component.html
index 81c6349..75d9462 100644
--- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/metadata/metadata.component.html
+++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/metadata/metadata.component.html
@@ -19,7 +19,7 @@
============LICENSE_END============================================
-->
-<form [formGroup]="CBAMetadata">
+<!-- <form [formGroup]="CBAMetadata"> -->
<mat-form-field class="form-field">
<input matInput placeholder="CBA File Name" formControlName="CBA_File_Name">
</mat-form-field>
@@ -35,4 +35,4 @@
<mat-form-field class="form-field">
<input matInput placeholder="Author" formControlName="author">
</mat-form-field>
- </form>
+ <!-- </form> -->
diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.component.html b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.component.html
index fbf0baa..8e22c70 100644
--- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.component.html
+++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.component.html
@@ -18,4 +18,5 @@
limitations under the License.
============LICENSE_END============================================
-->
-<app-file-upload></app-file-upload>
+<!-- <app-file-upload></app-file-upload> -->
+<input type="file" accept=".cba">
\ No newline at end of file
diff --git a/cds-ui/client/src/app/feature-modules/blueprint/test-template/test-template.module.ts b/cds-ui/client/src/app/feature-modules/blueprint/test-template/test-template.module.ts
index 9a5b9d6..09be58a 100644
--- a/cds-ui/client/src/app/feature-modules/blueprint/test-template/test-template.module.ts
+++ b/cds-ui/client/src/app/feature-modules/blueprint/test-template/test-template.module.ts
@@ -28,6 +28,9 @@
declarations: [
TestTemplateComponent
],
+ exports: [
+ TestTemplateComponent
+ ],
imports: [
CommonModule,
TestTemplateRoutingModule