Develop (#936)

* E2E/bug fixes -- tests for some bug fixes (#927)

* modify verification on advanced setting

* add tests on primary key and duplicate properties

* modify verification on trace headers

* added step on run input flow to set output uri suffix

* added mlcpInput page object

* DHFPROD-496 make consistent with current tutorial (#933)

Remove title declarations since we don't define a title property in the tutuorial.

* DHFPROD-675 add index confirm for save new entity

Author: aebadirad

examples/online-store/plugins/entities/Product/harmonize/Harmonize Products/content/content.sjs

@@ -41,7 +41,6 @@ function extractInstanceProduct(source) {
   let attachments = source;
 
   let sku = xs.string(source.sku || source.SKU);
-  let title = xs.string(source.title);
   let price = xs.decimal(source.price);
 
   // return the instance object
@@ -50,7 +49,6 @@ function extractInstanceProduct(source) {
     '$type': 'Product',
     '$version': '0.0.1',
     'sku': sku,
-    'title': title,
     'price': price
   }
 };

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

@@ -182,6 +182,10 @@ export class FlowPage extends AppPage {
     return element(by.css(`mdl-switch[id="${name}"]`));
   }
 
+  mlcpInput(name: string) {
+    return element(by.css(`input[name="${name}"]`));
+  }
+
   get toast() {
     return element(by.css('mdl-snackbar-component'));
   }
@@ -252,6 +256,11 @@ export class FlowPage extends AppPage {
     browser.actions().mouseMove(this.menuItem(dataFormat)).perform();
     this.menuItem(dataFormat).click();
 
+    // set output uri suffix
+    this.mlcpInput('output_uri_suffix').clear();
+    // verify that uri can contain character &
+    this.mlcpInput('output_uri_suffix').sendKeys('?doc=yes&type=foo');
+
     browser.wait(EC.elementToBeClickable(this.mlcpSection(' Delimited Text Options')));
     this.mlcpSection(' Delimited Text Options').click();
     browser.wait(EC.visibilityOf(this.mlcpSection(' Delimited Text Options')));

quick-start/e2e/specs/auth/authenticated.ts

@@ -62,7 +62,6 @@ export default function(tmpDir) {
       expect(loginPage.stagingAppserverNameLabel.isPresent()).toBe(true);
       expect(loginPage.stagingAppserverName.getAttribute('value')).toEqual('data-hub-STAGING');
       expect(loginPage.modulesDbName.getAttribute('value')).toEqual('data-hub-MODULES');
-      expect(loginPage.dataHubName.getAttribute('value')).toEqual('');
       expect(loginPage.dataHubName.getAttribute('value')).toEqual('data-hub');
       browser.driver.sleep(3000);
       expect(loginPage.projectDirTab.isDisplayed()).toBe(false);

quick-start/e2e/specs/create/create.ts

@@ -169,10 +169,11 @@ export default function() {
       // add id property
       console.log('add id property');
       entityPage.addProperty.click();
+      // setting primary key first
+      entityPage.getPropertyPrimaryKeyColumn(lastProperty).click();
       entityPage.getPropertyName(lastProperty).sendKeys('id');
       entityPage.getPropertyType(lastProperty).element(by.cssContainingText('option', 'string')).click();
       entityPage.getPropertyDescription(lastProperty).sendKeys('id description');
-      entityPage.getPropertyPrimaryKeyColumn(lastProperty).click();
       // add price property
       console.log('add price property');
       entityPage.addProperty.click();
@@ -190,6 +191,11 @@ export default function() {
       entityPage.getPropertyCardinality(lastProperty).element(by.css(selectCardinalityOneToManyOption)).click();
       entityPage.getPropertyDescription(lastProperty).sendKeys('products description');
       entityPage.getPropertyWordLexiconColumn(lastProperty).click();
+      // add a duplicate price property, negative test
+      entityPage.addProperty.click();
+      lastProperty = entityPage.lastProperty;
+      entityPage.getPropertyName(lastProperty).sendKeys('price');
+      entityPage.getPropertyType(lastProperty).element(by.cssContainingText('option', 'decimal')).click();
       entityPage.saveEntity.click();
       browser.wait(EC.elementToBeClickable(entityPage.confirmDialogYesButton));
       expect(entityPage.confirmDialogYesButton.isPresent()).toBe(true);
@@ -223,6 +229,7 @@ export default function() {
       browser.wait(EC.visibilityOf(entityPage.entityEditor));
       expect(entityPage.entityEditor.isPresent()).toBe(true);
       let idProperty = entityPage.getPropertyByPosition(1);
+      // verify that primary key is retained
       expect(entityPage.getPropertyName(idProperty).getAttribute('value')).toEqual('id');
       expect(entityPage.getPropertyType(idProperty).getAttribute('ng-reflect-model')).toEqual('string');
       expect(entityPage.getPropertyDescription(idProperty).getAttribute('value')).toEqual('id description');
@@ -239,6 +246,8 @@ export default function() {
       expect(entityPage.getPropertyCardinality(productsProperty).getAttribute('ng-reflect-model')).toEqual('ONE_TO_MANY');
       expect(entityPage.getPropertyDescription(productsProperty).getAttribute('value')).toEqual('products description');
       expect(entityPage.hasClass(entityPage.getPropertyWordLexicon(productsProperty), 'active')).toBe(true);
+      // verify duplicate property is not created, the count should be 3
+      entityPage.getPropertiesCount().then(function(props){expect(props === 3)});
       entityPage.cancelEntity.click();
       browser.wait(EC.invisibilityOf(entityPage.entityEditor));
     });

quick-start/e2e/specs/run/run.ts

@@ -60,11 +60,11 @@ export default function(tmpDir) {
       browsePage.searchBox().sendKeys('442403950907');
       browsePage.searchButton().click();
       browser.wait(EC.elementToBeClickable(browsePage.resultsUri()));
-      expect(browsePage.resultsUri().getText()).toContain('/board_games_accessories.csv-0-1');
+      expect(browsePage.resultsUri().getText()).toContain('/board_games_accessories.csv-0-1?doc=yes&type=foo');
       //verify on viewer page
       browsePage.resultsUri().click();
       viewerPage.isLoaded();
-      expect(viewerPage.searchResultUri().getText()).toContain('/board_games_accessories.csv-0-1');
+      expect(viewerPage.searchResultUri().getText()).toContain('/board_games_accessories.csv-0-1?doc=yes&type=foo');
       expect(element(by.cssContainingText('.cm-variable', 'sku')).isPresent()).toBe(true);
       expect(element(by.cssContainingText('.cm-string', '442403950907')).isPresent()).toBe(true);
       expect(element(by.cssContainingText('.cm-variable', 'attachments')).isPresent()).toBe(true);

quick-start/e2e/specs/traces/traces.ts

@@ -48,7 +48,7 @@ export default function() {
         console.log('verifying headers output');
         expect(traceViewerPage.pluginSubheader('headers').isPresent()).toBe(true);
         expect(element(by.cssContainingText('.cm-variable', 'key1')).isPresent()).toBe(true);
-        expect(element(by.cssContainingText('.cm-atom', '250.456')).isPresent()).toBe(true);
+        expect(element(by.cssContainingText('.cm-string', 'world')).isPresent()).toBe(true);
         traceViewerPage.tracesTab.click();
       });
 

quick-start/src/main/ui/app/entity-modeler/entity-modeler.component.ts

@@ -282,14 +282,7 @@ export class EntityModelerComponent implements AfterViewChecked {
   startEditing(entity: Entity) {
     this.entitiesService.editEntity(entity).subscribe(() => {
       this.entitiesService.saveEntity(entity).subscribe(() => {
-        let result = this.dialogService.confirm(`Saved. Update Indexes in MarkLogic?`, 'No', 'Yes');
-        result.subscribe(() => {
-          this.installService.updateIndexes().subscribe(() => {
-            this.snackbar.showSnackbar({
-              message: 'Indexes updated.',
-            });
-          });
-        }, () => {});
+        this.confirmUpdateIndexes()
       });
     },
     // cancel... do nothing
@@ -378,12 +371,32 @@ export class EntityModelerComponent implements AfterViewChecked {
     this.entitiesService.editEntity(entity).subscribe(() => {
       this.adjustCoords(entity);
       this.adjustSize(entity);
-      this.entitiesService.saveEntity(entity);
+      this.entitiesService.saveEntity(entity).subscribe(() => {
+        this.confirmUpdateIndexes();
+      });
     },
     // cancel... do nothing
     () => {
       console.log('cancel');
     });
   }
 
+  /**
+   * Display confirm dialog and update entity indexes upon confirmation
+   */
+  confirmUpdateIndexes() {
+    let result = this.dialogService.confirm(
+      `Saved. Update Indexes in MarkLogic?`,
+      'No',
+      'Yes'
+    );
+    result.subscribe(() => {
+      this.installService.updateIndexes().subscribe(() => {
+        this.snackbar.showSnackbar({
+          message: 'Indexes updated.',
+        });
+      });
+    }, () => {});
+  }
+
 }