QB: Rename Summary buttons to Add summary

intermine · Feb 15, 2022 · 5a67eb6 · 5a67eb6
1 parent 9d4306d
commit 5a67eb6
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 26 deletions.
diff --git a/cypress/integration/query_builder_test/logic_constraint_test.js b/cypress/integration/query_builder_test/logic_constraint_test.js
@@ -7,7 +7,7 @@ describe("Query view test", function() {
       cy.get(".model-browser-root").within(() => {
        cy.selectFromDropdown("Protein");        
        cy.get("select").should("have.value", "Protein");
-       cy.contains("Summary").click();
+       cy.contains("Add summary").click();
      });
 
      cy.get(".query-view-column").within(() => {
@@ -22,7 +22,7 @@ describe("Query view test", function() {
       cy.get(".model-browser-root").within(() => {
         cy.selectFromDropdown("Gene");        
         cy.get("select").should("have.value", "Gene");
-        cy.contains("Summary").click();
+        cy.contains("Add summary").click();
       });
 
       cy.get(".query-view-column").within(() => {
@@ -40,7 +40,7 @@ describe("Query view test", function() {
     it("can change the constraint to outer join", function(){
       cy.get('.model-browser-root').within(() => {
           cy.selectFromDropdown("Gene");
-          cy.contains("Summary").click();
+          cy.contains("Add summary").click();
       });
 
       cy.get(".query-view-column").within(() => {
@@ -52,7 +52,7 @@ describe("Query view test", function() {
   it("can edit constraint logic", function(){
       cy.get('.model-browser-root').within(() => {
           cy.selectFromDropdown("Gene");
-          cy.contains("Summary").click();
+          cy.contains("Add summary").click();
       });
       cy.get('.model-browser').within(() => {
           cy.get(".qb-class").filter(':contains("Protein")').siblings(".label-button").click();
@@ -74,7 +74,7 @@ describe("Query view test", function() {
   it("can add NULL as a constraint in search results", function(){
       cy.get('.model-browser-root').within(() => {
           cy.selectFromDropdown("Gene");
-          cy.contains("Summary").click();
+          cy.contains("Add summary").click();
       });
 
       cy.get(".query-view-column").within(() => {
@@ -92,4 +92,4 @@ describe("Query view test", function() {
       })
   })
 });
-  
+
diff --git a/cypress/integration/query_builder_test/model_browser_test.js b/cypress/integration/query_builder_test/model_browser_test.js
@@ -7,15 +7,15 @@ describe("Model browser test", function() {
     it("can select data type and summary attributes with model browser", function() {
       cy.get(".model-browser-root").within(() => {
         cy.selectFromDropdown("Protein");
-        cy.contains("Summary").click();
+        cy.contains("Add summary").click();
       });
     });
 
     it("can select specific attributes", function(){
       cy.get(".model-browser-root").within(() => {
         cy.selectFromDropdown("Gene");        
         cy.get("select").should("have.value", "Gene");
-        cy.contains("Summary").click();
+        cy.contains("Add summary").click();
       });
 
       cy.get(".model-browser").within(() => {
@@ -37,7 +37,7 @@ describe("Model browser test", function() {
       cy.get(".model-browser-column").within(() => {
         cy.selectFromDropdown("Protein");        
         cy.get("select").should("have.value", "Protein");
-        cy.contains("Summary").click();
+        cy.contains("Add summary").click();
         cy.get('[title="Remove all selected attributes"]').click();
       });
     });
@@ -47,7 +47,7 @@ describe("Model browser test", function() {
       cy.get(".model-browser-column > h4").should("include.text","Model Browser");
       cy.contains("Data Model").click();
       cy.contains("Gene").click();
-      cy.contains("Summary").click();
+      cy.contains("Add summary").click();
 
       cy.get(".query-view-column").within(() => {
         cy.get(".qb-label").should("include.text","Gene");
@@ -64,4 +64,4 @@ describe("Model browser test", function() {
       cy.get(".model-browser-column > h4").should("include.text","Model Browser");
     });
 });
-  
+
diff --git a/cypress/integration/query_builder_test/query_view_test.js b/cypress/integration/query_builder_test/query_view_test.js
@@ -7,7 +7,7 @@ describe("Query view test", function() {
     //   cy.viewport(1000, 600);
     //   cy.get(".model-browser-root").within(() => {
     //     cy.selectFromDropdown("Protein");        
-    //     cy.contains("Summary").click();
+    //     cy.contains("Add summary").click();
     //   });
 
     //   cy.get("div.panel-body").first().as("queryEditorTab").within(()=>{
@@ -21,7 +21,7 @@ describe("Query view test", function() {
     it("can save, clear, and load query", function() {
       cy.get(".model-browser-root").within(() => {
         cy.selectFromDropdown("Protein");        
-        cy.contains("Summary").click();
+        cy.contains("Add summary").click();
       });
 
       cy.get("div.panel-body").first().as("queryEditorTab").within(()=>{
@@ -45,7 +45,7 @@ describe("Query view test", function() {
       cy.get(".model-browser-root").within(() => {
         cy.selectFromDropdown("Protein");        
         cy.get("select").should("have.value", "Protein");
-        cy.contains("Summary").click();
+        cy.contains("Add summary").click();
       });
 
       cy.get("div.panel-body").first().as("queryEditorTab").within(() => {
@@ -59,7 +59,7 @@ describe("Query view test", function() {
       cy.get(".model-browser-root").within(() => {
         cy.selectFromDropdown("Protein");        
         cy.get("select").should("have.value", "Protein");
-        cy.contains("Summary").click();
+        cy.contains("Add summary").click();
       });
 
       cy.get('.query-view-column').within(() => {
@@ -75,7 +75,7 @@ describe("Query view test", function() {
       cy.get(".model-browser-root").within(() => {
         cy.selectFromDropdown("Protein");        
         cy.get("select").should("have.value", "Protein");
-        cy.contains("Summary").click();
+        cy.contains("Add summary").click();
       });
 
       cy.get(".panel-body").eq(1).as("previewTab").within(() => {
@@ -90,7 +90,7 @@ describe("Query view test", function() {
       cy.get(".model-browser-root").within(() => {
         cy.selectFromDropdown("Protein");        
         cy.get("select").should("have.value", "Protein");
-        cy.contains("Summary").click();
+        cy.contains("Add summary").click();
       });
 
       cy.get('.query-view-column').within(() => {
@@ -105,7 +105,7 @@ describe("Query view test", function() {
     it('can rename a saved query', function(){
       cy.get('.model-browser-root').within(() => {
         cy.selectFromDropdown("Gene");        
-        cy.contains("Summary").click();
+        cy.contains("Add summary").click();
       });
 
       cy.get('.query-view-column').within(()=>{
@@ -127,7 +127,7 @@ describe("Query view test", function() {
     it('can delete a saved query', function(){
       cy.get('.model-browser-root').within(() => {
         cy.selectFromDropdown("Gene");        
-        cy.contains("Summary").click();
+        cy.contains("Add summary").click();
       });
 
       cy.get(".panel-body").first().as("queryEditorTab").within(() => {
@@ -160,4 +160,4 @@ describe("Query view test", function() {
       });
     });
 });
-  
+
diff --git a/cypress/integration/user_account/user_account_test.js b/cypress/integration/user_account/user_account_test.js
@@ -101,7 +101,7 @@ describe("User Account Test", function() {
         cy.visit("/biotestmine/querybuilder");
         cy.get(".model-browser-root").within(() => {
             cy.selectFromDropdown("Protein");        
-            cy.contains("Summary").click();
+            cy.contains("Add summary").click();
           });
 
           cy.get("div.panel-body").first().as("queryEditorTab").within(()=>{
@@ -148,4 +148,4 @@ describe("User Account Test", function() {
         cy.wait("@logout");
         cy.get(".mine-intro").should("exist");
     })
-});
+});
diff --git a/src/cljs/bluegenes/pages/querybuilder/views.cljs b/src/cljs/bluegenes/pages/querybuilder/views.cljs
@@ -164,8 +164,9 @@
             [:span.label-button
              {:on-click (fn [e]
                           (ocall e :stopPropagation)
-                          (dispatch [:qb/enhance-query-add-summary-views path sub]))}
-             "Summary"])]
+                          (dispatch [:qb/enhance-query-add-summary-views path sub]))
+              :title (str "Add summary fields of " str-path " to query view")}
+             "Add summary"])]
          (when open?
            (let [class (im-path/class model (join "." trail))]
              (into [:ul]
@@ -333,8 +334,8 @@
           (when @root-class
             [:button.label-button
              {:on-click #(dispatch [:qb/enhance-query-add-summary-views [(name @root-class)]])
-              :title (str "Summarise " @root-class " by adding its common attributes")}
-             "Summary"])]
+              :title (str "Add summary fields of " (name @root-class) " to query view")}
+             "Add summary"])]
          (if @root-class
            [model-browser
             (assoc @current-model :type-constraints @type-constraints)