Changes to QuickStart to make the baseUri property required

Author: bsrikan

quick-start/e2e/page-objects/entities/entities.ts

@@ -53,6 +53,10 @@ export class EntityPage extends AppPage {
     return element(by.css('mdl-textfield[label=Version] input'));
   }
 
+  get entityBaseUri() {
+    return element(by.css('mdl-textfield[label="Base URI"] input'));
+  }
+
   getEntityBox(entityName: string) {
     return element(by.cssContainingText('app-entity-box div.title span', entityName));
   }

quick-start/src/main/ui/app/entities/entity.model.ts

@@ -160,7 +160,7 @@ export class Entity {
         height: 100
       },
       'info': {
-        'baseUri': null,
+        'baseUri': 'http://example.org',
         'description': null,
         'title': null,
         'version': '0.0.1'

quick-start/src/main/ui/app/shared/components/entity-editor/entity-editor.component.html

@@ -18,7 +18,8 @@
       <mdl-textfield type="text" label="Description" [(ngModel)]="entity.info.description" floating-label></mdl-textfield>
     </div>
     <div>
-      <mdl-textfield type="text" label="Base URI" [(ngModel)]="entity.info.baseUri" floating-label></mdl-textfield>
+      <mdl-textfield type="text" label="Base URI" required [(ngModel)]="entity.info.baseUri" floating-label></mdl-textfield>
+      <span *ngIf="!validBaseUri" class="alert-text">A valid base uri is required, eg http://example.org</span>
     </div>
     <div class="properties-heading">
       <div class="properties-title">Properties</div>

quick-start/src/main/ui/app/shared/components/entity-editor/entity-editor.component.ts

@@ -49,12 +49,16 @@ export class EntityEditorComponent implements AfterViewChecked {
 
   propAdded: boolean = false;
   validTitle: boolean = true;
+  validBaseUri: boolean = true;
 
   // property name pattern: name cannot have space characters in it
   readonly PROPERTY_NAME_PATTERN = /^[^\s]+$/;
   // Entity title: no space or invalid characters
   readonly ENTITY_TITLE_REGEX = /^.*?(?=[\^\s!@#%&$\*:;<>\?/\{\|\}]).*$/;
 
+  // Base URI: http://example.org/
+  readonly BASE_URI_REGEX = /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]/;
+
   constructor(
     private dialog: MdlDialogReference,
     private dialogService: MdlDialogService,
@@ -232,6 +236,9 @@ export class EntityEditorComponent implements AfterViewChecked {
         // invalid characters in title
         this.validTitle = false;
         return;
+      } if (!this.BASE_URI_REGEX.test(this.entity.info.baseUri) || this.entity.info.baseUri === '' || this.entity.info.baseUri === null) {
+        this.validBaseUri = false;
+        return;
       } else {
         this.validTitle = true;
         // Set entity state based on property ui flags