From 233875014617367f4f4df4ee96d9f6f851790d03 Mon Sep 17 00:00:00 2001
From: temi <temi.varghese@csiro.au>
Date: Fri, 14 Mar 2025 14:23:14 +1100
Subject: [PATCH 1/3] #3467 - fix issue with date option check being cleared
 when checking facets item other than date

---
 grails-app/views/home/_projectFinder.gsp           |  2 +-
 .../ala/fieldcapture/ProjectExplorerSpec.groovy    | 14 ++++++++++++++
 .../groovy/pages/ProjectExplorer.groovy            |  2 ++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/grails-app/views/home/_projectFinder.gsp b/grails-app/views/home/_projectFinder.gsp
index e3f64c497..30804f35d 100644
--- a/grails-app/views/home/_projectFinder.gsp
+++ b/grails-app/views/home/_projectFinder.gsp
@@ -13,7 +13,7 @@
 <g:elseif test="${results?.hits?.total?:0 > 0}">
     <div class="row">
         <div id="facetsCol" class="bg-white" style="display:none;">
-            <g:set var="reqParams" value="query,sort,order,max,fq,fromDate,toDate"/>
+            <g:set var="reqParams" value="query,sort,order,max,fq,fromDate,toDate,isFilterByCompletedProjects"/>
             <div class="visible-phone pull-right" style="margin-top: 5px;">
                 <a href="#" id="toggleFacetDisplay" rel="facetsContent" role="button" class="btn btn-sm btn-inverse" style="color:white;">
                     <span>show</span> options&nbsp;
diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/ProjectExplorerSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/ProjectExplorerSpec.groovy
index 46796bd4e..ea8fac799 100644
--- a/src/integration-test/groovy/au/org/ala/fieldcapture/ProjectExplorerSpec.groovy
+++ b/src/integration-test/groovy/au/org/ala/fieldcapture/ProjectExplorerSpec.groovy
@@ -109,8 +109,22 @@ class ProjectExplorerSpec extends StubbedCasSpec {
             projects.size() == 1
         }
 
+        when: "We organisation facet is selected, date option selection should remain checked"
+        at ProjectExplorer
+        organisationFacet.click()
+        waitFor {
+            organisationFacetItems.displayed
+        }
+        organisationFacetItems[0].click()
+
+        then:
+        dateOption.value() == "true"
+
         when: "We clear dates"
         at ProjectExplorer
+        waitFor {
+            clearDatesBtn.displayed
+        }
         clearDatesBtn.click()
 
         then:
diff --git a/src/integration-test/groovy/pages/ProjectExplorer.groovy b/src/integration-test/groovy/pages/ProjectExplorer.groovy
index cfc58e424..e7e4f4bfb 100644
--- a/src/integration-test/groovy/pages/ProjectExplorer.groovy
+++ b/src/integration-test/groovy/pages/ProjectExplorer.groovy
@@ -63,6 +63,8 @@ class ProjectExplorer extends ReloadablePage {
         dateOption(required: false, wait: true) { $("#isFilterByCompletedProjectsOption", dynamic: true) }
         dateFacet(required: false) { $("#projectDates", dynamic: true) }
         clearDatesBtn(required: false) { $("#facet-dates .clearDates", dynamic: true) }
+        organisationFacet(required: false) { $("#organisationFacet", dynamic: true) }
+        organisationFacetItems(required: false) { $("#facet-organisationFacet > div > ul > li > a", dynamic: true) }
         inputText{ $("#keywords")}
 
         dashboardContent (required: false) {$("div#dashboard-content")}

From 51d3b1651a23449f261c9e416b0acffadd9228b7 Mon Sep 17 00:00:00 2001
From: chrisala <chris.godwin.ala@gmail.com>
Date: Fri, 14 Mar 2025 08:55:04 +1100
Subject: [PATCH 2/3] Fixing functional test that started failing #3476

---
 .../groovy/au/org/ala/fieldcapture/ImportProjectsSpec.groovy   | 3 ++-
 .../groovy/au/org/ala/fieldcapture/StubbedCasSpec.groovy       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/ImportProjectsSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/ImportProjectsSpec.groovy
index f3a586c1b..f83d2a156 100644
--- a/src/integration-test/groovy/au/org/ala/fieldcapture/ImportProjectsSpec.groovy
+++ b/src/integration-test/groovy/au/org/ala/fieldcapture/ImportProjectsSpec.groovy
@@ -11,13 +11,14 @@ import pages.RlpProjectPage
 @Slf4j
 class ImportProjectsSpec extends StubbedCasSpec {
 
-    def setup() {
+    def setupSpec() {
         useDataSet('dataset2')
         loginAsAlaAdmin(browser)
         to AdminTools
         clearMetadata()
         to AdminClearCachePage
         clearProgramListCache()
+        at AdminClearCachePage // reset at check time
         clearServiceListCache()
     }
 
diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/StubbedCasSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/StubbedCasSpec.groovy
index c00bc3430..1dd160a46 100644
--- a/src/integration-test/groovy/au/org/ala/fieldcapture/StubbedCasSpec.groovy
+++ b/src/integration-test/groovy/au/org/ala/fieldcapture/StubbedCasSpec.groovy
@@ -201,7 +201,7 @@ class StubbedCasSpec extends FieldcaptureFunctionalTest {
     private String loggedInUser = null
 
     def login(Map userDetails, Browser browser) {
-        if (loggedInUser != userDetails.userId) {
+        if (loggedInUser && loggedInUser != userDetails.userId) {
             logout(browser)
         }
         oidcLogin(userDetails, browser)

From 5084ed370cd7cd37ad28c6cbf80ef365b17f8bb7 Mon Sep 17 00:00:00 2001
From: chrisala <chris.godwin.ala@gmail.com>
Date: Fri, 14 Mar 2025 10:29:57 +1100
Subject: [PATCH 3/3] Fixing functional test that started failing #3476

---
 .../groovy/au/org/ala/fieldcapture/StubbedCasSpec.groovy        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/StubbedCasSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/StubbedCasSpec.groovy
index 1dd160a46..c00bc3430 100644
--- a/src/integration-test/groovy/au/org/ala/fieldcapture/StubbedCasSpec.groovy
+++ b/src/integration-test/groovy/au/org/ala/fieldcapture/StubbedCasSpec.groovy
@@ -201,7 +201,7 @@ class StubbedCasSpec extends FieldcaptureFunctionalTest {
     private String loggedInUser = null
 
     def login(Map userDetails, Browser browser) {
-        if (loggedInUser && loggedInUser != userDetails.userId) {
+        if (loggedInUser != userDetails.userId) {
             logout(browser)
         }
         oidcLogin(userDetails, browser)