Merge "Search template and Metadata form"

4 files changed, 35 insertions, 10 deletions

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 b4aca6bcf..81c634970 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,6 +19,20 @@ limitations under the License.
 ============LICENSE_END============================================
 -->
 
-<p>
-  metadata works!
-</p>
+<form [formGroup]="CBAMetadata">
+  <mat-form-field class="form-field">
+    <input matInput placeholder="CBA File Name" formControlName="CBA_File_Name">
+  </mat-form-field>
+  <mat-form-field class="form-field">
+    <input matInput placeholder="CBA Version" formControlName="CBA_Version">
+  </mat-form-field>
+  <mat-form-field class="form-field">
+    <input matInput placeholder="CSAR Version" formControlName="CSAR_Version">
+  </mat-form-field>
+  <mat-form-field class="form-field">
+    <input matInput placeholder="Entry Definition" formControlName="entry_Definition">
+  </mat-form-field>
+  <mat-form-field class="form-field">
+    <input matInput placeholder="Author" formControlName="author">
+  </mat-form-field>
+  </form>
diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/metadata/metadata.component.scss b/cds-ui/client/src/app/feature-modules/blueprint/select-template/metadata/metadata.component.scss
index 22941b5fa..fa7f2bf83 100644
--- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/metadata/metadata.component.scss
+++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/metadata/metadata.component.scss
@@ -17,4 +17,8 @@ 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============================================
-*/
\ No newline at end of file
+*/
+.form-field{
+    width: 50%;
+    margin: 10px;
+}
\ No newline at end of file
diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/metadata/metadata.component.ts b/cds-ui/client/src/app/feature-modules/blueprint/select-template/metadata/metadata.component.ts
index e20dde13b..b8f57cb5f 100644
--- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/metadata/metadata.component.ts
+++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/metadata/metadata.component.ts
@@ -19,7 +19,8 @@ limitations under the License.
 ============LICENSE_END============================================
 */
 
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit} from '@angular/core';
+import {FormBuilder, FormGroup, Validators} from '@angular/forms';
 
 @Component({
   selector: 'app-metadata',
@@ -27,10 +28,18 @@ import { Component, OnInit } from '@angular/core';
   styleUrls: ['./metadata.component.scss']
 })
 export class MetadataComponent implements OnInit {
+  CBAMetadata: FormGroup;
 
-  constructor() { }
+  constructor(private _formBuilder: FormBuilder) { }
 
   ngOnInit() {
+    this.CBAMetadata = this._formBuilder.group({
+      CBA_File_Name: ['', Validators.required],
+      CBA_Version: ['', Validators.required],
+      CSAR_Version: ['', Validators.required],
+      entry_Definition: ['', Validators.required],
+      author: ['', Validators.required]
+    });
   }
 
-}
+}
\ No newline at end of file
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 5be69791f..fbf0baa77 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,6 +18,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ============LICENSE_END============================================
 -->
-<p>
-  search-template works!
-</p>
+<app-file-upload></app-file-upload>