Merge "CBA Blueprint Wizard"

7 files changed, 46 insertions, 7 deletions

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 531327d0c..2b3c99370 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 @@ import { FileuploadComponent } from './fileupload/fileupload.component';
   ],
   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 68d0ade67..31c7a6ab7 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 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 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 d1c125926..e39beacb2 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 @@ import { DeployTemplateRoutingModule } from './deploy-template-routing.module';
   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 6175208e6..f502de4b1 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 @@ import { ModifyTemplateRoutingModule } from './modify-template-routing.module';
 
 @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 81c634970..75d9462bd 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 @@ limitations under the License.
 ============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 @@ limitations under the License.
   <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 fbf0baa77..8e22c706f 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 @@ See the License for the specific language governing permissions and
 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 9a5b9d607..09be58a56 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 @@ import { TestTemplateRoutingModule } from './test-template-routing.module';
   declarations: [
     TestTemplateComponent
   ],
+  exports: [
+    TestTemplateComponent
+  ],
   imports: [
     CommonModule,
     TestTemplateRoutingModule