#768 Commit reverts back to old acctypes

Rothamsted · Aug 9, 2023 · 5ad84bc · 5ad84bc
1 parent 78a8b3d
commit 5ad84bc
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 21 deletions.
diff --git a/client-base/src/main/webapp/html/javascript/example-queries.js b/client-base/src/main/webapp/html/javascript/example-queries.js
@@ -233,9 +233,11 @@ const exampleQuery = function()
                 var isGeneListRestricted = userAccess.isLimitEnforced(); 
 
                 /* TODO: too messed-up, See #768 */
-                if(isQueryRestricted && isGeneListRestricted){
+                if(!isQueryRestricted){
                     queryRestriction = `<a class='query-restriction-text' onclick="loginModalInit()">(Login)</a>`; 
-                }else{
+                }
+
+                if(isGeneListRestricted && accType == 'pro'){
                      queryRestriction = `<a class='query-restriction-text' href="https://knetminer.com/pricing-plans" target="_blank" >(Upgrade)</a>`;
                 }
 
@@ -251,8 +253,6 @@ const exampleQuery = function()
         }) 
     }
 
-
-
     return{
         setQueryData:setQueryData,
         populateQueryValues:populateQueryValues,

diff --git a/client-base/src/main/webapp/html/javascript/user-access.js b/client-base/src/main/webapp/html/javascript/user-access.js
@@ -3,7 +3,7 @@
  */
 class UserAccessManager{
 
-    #current = 'free'; 
+    #current = 'guest'; 
     #defaultGeneLimit = 20; 
     #isGeneLimitEnforced = true; 
 
@@ -24,7 +24,7 @@ class UserAccessManager{
           headers: { "Accept": "application/json; charset=utf-8", "Content-Type": "application/json; charset=utf-8" },
           success: function (data) {
             if( ! typeof data.id == 'undefined') return (data.plan.name).toLowerCase(); 
-            return 
+            return null
           },
 
         });
@@ -70,8 +70,8 @@ class UserAccessManager{
 class UserRole {
     #level = null
 
-    static FREE = new UserRole ( 1000 )
-    static REGISTERED = new UserRole ( 500 )
+    static GUEST = new UserRole ( 1000 )
+    static FREE = new UserRole ( 500 )
     static PRO = new UserRole ( 100 )
 
     constructor(level){
@@ -100,8 +100,7 @@ class UserRole {
 	 * Param can be a UserRole or a string.
    */
     static can ( role,queryRole )
-  {   
-
+  {  
     return  UserRole.compare(role,queryRole) >= 0;
   }
 

diff --git a/client-base/src/main/webapp/html/javascript/utils.js b/client-base/src/main/webapp/html/javascript/utils.js
@@ -35,7 +35,7 @@ $(document).ready (
 			initResetButton();
 			showToolTips();
 			intialiseFeedbackCtaConfig();
-			setupGenesSearch
+			setupGenesSearch()
 
 			// Do this as last step, so that it doesn't track in 
 			// case of failure		

diff --git a/datasets/poaceae-test/config/sample-queries.xml b/datasets/poaceae-test/config/sample-queries.xml
@@ -5,15 +5,16 @@
 	<query>
 		<description>Keyword search (AND)</description>
 		<term>"seed germination" AND flavon*</term>
-		<minimumUserRole>free</minimumUserRole>
+		<minimumUserRole>guest</minimumUserRole>
 	</query>
 
 	<query>
 		<description>Keyword search (OR)</description>
 		<term>dormancy OR anthocyanin</term>
+		<minimumUserRole>guest</minimumUserRole>
 		<!--
 		  TODO:
-		  - The common convention for these is all lower case, free and not free.
+		  - The common convention for these is all lower case, guest and not guest.
 		  Then, they're usually checked case-insensitive, as it is already implemented, to that's to be kept
 		  
 			- minimumUserRole is a poor name for a config file like this. What does it mean? Accession? Access?
@@ -28,15 +29,14 @@
 			
 			Let's discuss the last two at some point.
 		-->
-		<minimumUserRole>free</minimumUserRole>
 	</query>
 
 	<query>
 		<description>Gene names</description>
 		<term>drought OR heat OR frost</term>
 		<gene>TPS*</gene>
 		<gene>TPP?</gene>
-		<minimumUserRole>free</minimumUserRole>
+		<minimumUserRole>guest</minimumUserRole>
 	</query>	
 
 	<!-- Wheat queries -->
@@ -48,7 +48,7 @@
 		<gene>TRAESCS3D03G0544800</gene>
 		<gene>TaSIZ1</gene>
 		<gene>CDC5</gene>
-		<minimumUserRole>registered</minimumUserRole>
+		<minimumUserRole>guest</minimumUserRole>
 	</query>
 
 	<query>
@@ -75,7 +75,7 @@
 		<gene>TRAESCS4A02G206800</gene>
 		<gene>TRAESCS3B02G006100</gene>
 		<gene>TRAESCS3A02G464900</gene>
-		<minimumUserRole>registered</minimumUserRole>
+		<minimumUserRole>free</minimumUserRole>
 	</query>
 
 	<query>
@@ -94,7 +94,7 @@
 		<gene>TraesCS3D02G468400</gene>
 		<gene>TraesCS3B02G280700</gene>
 		<gene>TraesCS2D02G493400</gene>
-		<minimumUserRole>registered</minimumUserRole>
+		<minimumUserRole>free</minimumUserRole>
 	</query>
 
 	<query>
@@ -145,7 +145,7 @@
 		<description>FLC gene expression</description>
 		<taxId>3702</taxId>
 		<term>flowering FLC FT</term>
-		<minimumUserRole>registered</minimumUserRole>
+		<minimumUserRole>free</minimumUserRole>
 	</query>
 
 	<query>	
@@ -160,7 +160,7 @@
 			<label>Petal size</label>
 		</region>
         <gene>At4g18330</gene>
-		<minimumUserRole>registered</minimumUserRole>
+		<minimumUserRole>free</minimumUserRole>
 	</query>
 
 	<query>
@@ -179,7 +179,7 @@
 		<gene>Os12g0484900</gene>
 		<gene>OsGRF7</gene>
 		<gene>GRF7</gene>
-		<minimumUserRole>registered</minimumUserRole>
+		<minimumUserRole>free</minimumUserRole>
 	</query>
 
 	<query>