Merge "Data Dictionary Wizard"

6 files changed, 68 insertions, 7 deletions

diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.module.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.module.ts
index 2ece3cef7..e4fcf1378 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.module.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-creation/resource-creation.module.ts
@@ -28,7 +28,16 @@ import { MatToolbarModule,MatIconModule, MatButtonModule, MatSidenavModule,  Mat
 import { UploadResourceComponent } from './upload-resource/upload-resource.component';
 
 @NgModule({
-  declarations: [ResourceCreationComponent],
+  declarations: [
+    ResourceCreationComponent,
+    ResourceTemplateOptionsComponent,
+    UploadResourceComponent
+  ],
+  exports: [
+    ResourceCreationComponent,
+    ResourceTemplateOptionsComponent,
+    UploadResourceComponent
+  ],
   imports: [
     CommonModule,
     ResourceCreationRoutingModule,
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition-routing.module.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition-routing.module.ts
index aa19c936d..986c28844 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition-routing.module.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition-routing.module.ts
@@ -22,7 +22,6 @@ import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import { ResourceDefinitionComponent } from './resource-definition.component';
 
-
 const routes: Routes = [
     {
         path: '',
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.html b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.html
index df6cc7363..6d3186c98 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.html
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.component.html
@@ -18,6 +18,32 @@
 * ============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>Resource creation Method</ng-template>
+        <app-resource-creation></app-resource-creation>
+        <div>
+          <button mat-button matStepperNext style="color:white;background:gray">Proceed</button>
+        </div>
+      </mat-step>
+      <mat-step [stepControl]="secondFormGroup">
+        <ng-template matStepLabel>Resource Edit/Validate </ng-template>
+        <app-resource-edit></app-resource-edit>
+        <!-- <div>
+              <button mat-button matStepperNext style="color:white;background:gray">Proceed</button>
+          </div> -->
+      </mat-step>
+      <mat-step [stepControl]="thirdFormGroup">
+        <ng-template matStepLabel>Save in Database</ng-template>
+        <app-save-resource></app-save-resource>
+        <div>
+          <button mat-button matStepperNext style="color:white;background:gray">Save</button>
+        </div>
+      </mat-step>
+    </mat-horizontal-stepper>
+  </mat-card-content>
+</mat-card>
\ No newline at end of file
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.module.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.module.ts
index 45b062f82..c618e2748 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.module.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-definition.module.ts
@@ -24,6 +24,12 @@ import { CommonModule } from '@angular/common';
 import { ResourceDefinitionRoutingModule } from './resource-definition-routing.module';
 import { ResourceDefinitionComponent } from './resource-definition.component';
 import { SharedModule } from '../../../app/common/shared/shared.module';
+import { SaveResourceModule } from './save-resource/save-resource.module';
+import { ResourceCreationModule } from './resource-creation/resource-creation.module';
+import { ResourceEditModule } from './resource-edit/resource-edit.module';
+
+import { MatToolbarModule, MatButtonModule, MatSidenavModule,  MatListModule, MatGridListModule, MatCardModule, MatMenuModule, MatTableModule, MatPaginatorModule, MatSortModule, MatInputModule, MatSelectModule, MatRadioModule, MatFormFieldModule, MatStepperModule} from '@angular/material';
+import { MatIconModule } from '@angular/material/icon';
 
 @NgModule({
   
@@ -32,7 +38,26 @@ import { SharedModule } from '../../../app/common/shared/shared.module';
     imports: [
     CommonModule,
     ResourceDefinitionRoutingModule,
-    SharedModule
+    SharedModule,
+    SaveResourceModule,
+    ResourceCreationModule,
+    ResourceEditModule,
+    MatToolbarModule,
+    MatButtonModule,
+    MatSidenavModule,
+    MatIconModule,
+    MatListModule,
+    MatGridListModule,
+    MatCardModule,
+    MatMenuModule,
+    MatTableModule,
+    MatPaginatorModule,
+    MatSortModule,
+    MatInputModule,
+    MatSelectModule, 
+    MatRadioModule, 
+    MatFormFieldModule, 
+    MatStepperModule,
   ]
 })
 export class ResourceDefinitionModule { }
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.module.ts b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.module.ts
index 6e64fb9fc..3efab6724 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.module.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-edit.module.ts
@@ -25,7 +25,8 @@ import { ResourceEditComponent } from './resource-edit.component';
 import { ResourceEditRoutingModule } from './resource-edit-routing.module';
 
 @NgModule({
-  declarations: [ResourceEditComponent],
+  declarations: [ ResourceEditComponent ],
+  exports: [ ResourceEditComponent ],
   imports: [
     CommonModule,
     ResourceEditRoutingModule
diff --git a/cds-ui/client/src/app/feature-modules/resource-definition/save-resource/save-resource.module.ts b/cds-ui/client/src/app/feature-modules/resource-definition/save-resource/save-resource.module.ts
index cd343755b..d87cfe31b 100644
--- a/cds-ui/client/src/app/feature-modules/resource-definition/save-resource/save-resource.module.ts
+++ b/cds-ui/client/src/app/feature-modules/resource-definition/save-resource/save-resource.module.ts
@@ -26,6 +26,7 @@ import { SaveResourceRoutingModule } from './save-resource-routing.module';
 
 @NgModule({
   declarations: [SaveResourceComponent],
+  exports: [ SaveResourceComponent ],
   imports: [
     CommonModule,
     SaveResourceRoutingModule