Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Es alignment for 4.x #1742

Merged
merged 22 commits into from
Jan 18, 2019
Merged

Es alignment for 4.x #1742

merged 22 commits into from
Jan 18, 2019

Conversation

aebadirad
Copy link
Contributor

No description provided.

ryanjdew and others added 10 commits January 9, 2019 09:32
* Move enitiy management logic from QS to core lib

* Update tests to not rely on list order for comparison

* Save the entity on disk
* Support for content creation with ES models

* Fixing variable assignment and indentation
…1739)

* Add triggers for entity model TDE generation

* Combine referenced entities into a single entity model
* Add triggers for entity model TDE generation

* Combine referenced entities into a single entity model

* Add triggers folder to upgrade test example
@aebadirad aebadirad changed the title DO NOT MERGE - Es alignment test PR Es alignment for 4.x Jan 16, 2019
@aebadirad
Copy link
Contributor Author

Holding on this. I've asked @srinathgit to create another command that just loads artifacts, as to isolate it away from modules, so we can have more control over grabbing ALL artifacts and deploying them independent (or in conjunction with) module loading.

srinathgit and others added 12 commits January 18, 2019 08:54
* Prevent mappings files being loaded to the hub modules db

* Create a separate command for loading user artifacts

* Create corresponding gradle command for loading user artifacts

* Run 'LoadUserArtifactsCommand' after 'LoadUserModulesCommand' is run

* Modify existing tests/ add new tests
* Populating 'errors' and 'hasErrors' object (Fix for DHFPROD-1698)

* Place bug icon on the correct line (DHFPROD-1698)
* Setting content db to final db

* Test to verify if content db is set to final db
* Revert "Upgrade Spring boot ver for QS (#1698)"

This reverts commit c2b1323

* Update authenticated.ts

* Update authenticated.ts
* add po for invalid title alert

* add po for duplicate flowname alert

* add test for invalid char on entity title

* add test for duplicate flow names
* Move enitiy management logic from QS to core lib

* Update tests to not rely on list order for comparison

* Save the entity on disk
* Prevent mappings files being loaded to the hub modules db

* Create a separate command for loading user artifacts

* Create corresponding gradle command for loading user artifacts

* Run 'LoadUserArtifactsCommand' after 'LoadUserModulesCommand' is run

* Modify existing tests/ add new tests
# Conflicts:
#	marklogic-data-hub/src/main/java/com/marklogic/hub/entity/AbstractEntity.java
#	marklogic-data-hub/src/main/java/com/marklogic/hub/entity/Entity.java
#	marklogic-data-hub/src/main/java/com/marklogic/hub/entity/EntityImpl.java
#	ml-data-hub-plugin/src/test/groovy/com/marklogic/gradle/task/CreateEntityTaskTest.groovy
@aebadirad aebadirad merged commit ace5aad into develop Jan 18, 2019
@aebadirad aebadirad deleted the es-alignment branch January 22, 2019 22:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants