fixing pagination bug in new code

Author: paxtonhare

marklogic-data-hub/src/main/java/com/marklogic/hub/deploy/commands/LoadUserModulesCommand.java

@@ -3,6 +3,7 @@
 import com.marklogic.appdeployer.AppConfig;
 import com.marklogic.appdeployer.command.AbstractCommand;
 import com.marklogic.appdeployer.command.CommandContext;
+import com.marklogic.appdeployer.command.SortOrderConstants;
 import com.marklogic.appdeployer.command.modules.AllButAssetsModulesFinder;
 import com.marklogic.appdeployer.command.modules.AssetModulesFinder;
 import com.marklogic.client.DatabaseClient;
@@ -33,6 +34,7 @@ public void setForceLoad(boolean forceLoad) {
     private boolean forceLoad = false;
 
     public LoadUserModulesCommand(HubConfig hubConfig) {
+        setExecuteSortOrder(SortOrderConstants.LOAD_MODULES + 1);
         this.hubConfig = hubConfig;
     }
 

quick-start/src/main/java/com/marklogic/quickstart/model/SearchQuery.java

@@ -23,7 +23,6 @@
 public class SearchQuery {
     public String query;
     public String sort;
-    public boolean entitiesOnly;
     public long start;
     public long count;
     public HubDatabase database;

quick-start/src/main/java/com/marklogic/quickstart/service/SearchService.java

@@ -29,15 +29,11 @@
 import com.marklogic.hub.util.PerformanceLogger;
 import com.marklogic.quickstart.model.SearchQuery;
 import com.marklogic.quickstart.util.QueryHelper;
-import org.codehaus.jettison.json.JSONObject;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.dom.Node;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-import java.io.ByteArrayInputStream;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -60,30 +56,20 @@ public SearchService(HubConfig hubConfig) {
         this.finalDocMgr = finalClient.newDocumentManager();
     }
 
-    private Element getOptions(boolean entitiesOnly) {
+    private Element getOptions() {
         try {
             Path dir = Paths.get(hubConfig.projectDir, HubConfig.USER_CONFIG_DIR, HubConfig.SEARCH_OPTIONS_FILE);
             if (dir.toFile().exists()) {
                 DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
                 DocumentBuilder db = dbf.newDocumentBuilder();
                 Document doc = db.parse(dir.toFile());
-                Element root = doc.getDocumentElement();
-
-                if (entitiesOnly) {
-                    String additionalQuery = "<additional-query xmlns=\"http://marklogic.com/appservices/search\">\n" +
-                        "      <cts:element-query xmlns:cts=\"http://marklogic.com/cts\">\n" +
-                        "      <cts:element xmlns:es=\"http://marklogic.com/entity-services\">es:instance</cts:element>\n" +
-                        "      <cts:true-query/>\n" +
-                        "      </cts:element-query>\n" +
-                        "    </additional-query>";
-                    Node n = doc.importNode(db.parse(new ByteArrayInputStream(additionalQuery.getBytes(StandardCharsets.UTF_8))).getDocumentElement(), true);
-                    root.appendChild(n);
-                }
+                return doc.getDocumentElement();
             }
         }
         catch (Exception e) {
             throw new RuntimeException(e);
         }
+
         return null;
     }
 
@@ -118,7 +104,7 @@ public StringHandle search(SearchQuery searchQuery) {
 
         StructuredQueryBuilder.AndQuery sqd = sb.and(queries.toArray(new StructuredQueryDefinition[0]));
 
-        String searchXml = QueryHelper.serializeQuery(sb, sqd, searchQuery.sort, getOptions(searchQuery.entitiesOnly));
+        String searchXml = QueryHelper.serializeQuery(sb, sqd, searchQuery.sort, getOptions());
         logger.info(searchXml);
         RawCombinedQueryDefinition querydef = queryMgr.newRawCombinedQueryDefinitionAs(Format.XML, searchXml);
 

quick-start/src/main/ui/app/search/search.component.html

@@ -15,7 +15,7 @@
   <div *ngIf="!loadingTraces" layout="column" flex layout-align="center center" class="full-width">
     <app-pagination [start]="searchResponse.start"
           [total]="searchResponse.total"
-          [pageLength]="searchResponse.pageLength"
+          [pageLength]="searchResponse['page-length']"
           (pageChanged)="pageChanged($event)"></app-pagination>
     <div *ngIf="!loadingTraces && (!searchResponse || searchResponse.total === 0)">No Data</div>
     <div class="mdl-grid results">