From 0cc23085f52a96019eebf3d73a1b57591370c16b Mon Sep 17 00:00:00 2001
From: Dipannita Dey <ddey2@illinois.edu>
Date: Thu, 8 Sep 2022 15:05:54 -0500
Subject: [PATCH 1/2] Added a dropdown menu for specific space types

---
 CHANGELOG.md                           |  4 ++++
 app/views/spaces/listSpaces.scala.html |  7 +++++++
 public/javascripts/displayPanels.js    | 19 +++++++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85bd19a86..3d7f5b82c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+### Unreleased
+
+### Fixed
+- Added a dropdown menu to select all spaces, your spaces and also the spaces you have access to. [#374](https://github.com/clowder-framework/clowder/issues/374)
 
 ## 1.21.0 - 2022-08-23
 
diff --git a/app/views/spaces/listSpaces.scala.html b/app/views/spaces/listSpaces.scala.html
index 76ad41dd8..1518df0ae 100644
--- a/app/views/spaces/listSpaces.scala.html
+++ b/app/views/spaces/listSpaces.scala.html
@@ -44,6 +44,13 @@ <h1>@title</h1>
                     }
                     case (_,_) => {}
                 }
+                <div class="btn-group btn-group-sm" id="spacesOwnership-displayed-dropdown">
+                    <select id="spacesOwnership" class="form-control" onchange="getSpaceType('@user.get.id')">
+                        <option value="1">Joined Spaces</option>
+                        <option value="2">My Spaces</option>
+                        <option value="3">All Spaces</option>
+                    </select>
+                </div>
                 <div class="btn-group btn-group-sm" id="number-displayed-dropdown">
                     <select id="numPageItems" class="form-control" onchange="getValue()">
                         <option value="12">12</option>
diff --git a/public/javascripts/displayPanels.js b/public/javascripts/displayPanels.js
index 7f503f91d..b8907a53e 100644
--- a/public/javascripts/displayPanels.js
+++ b/public/javascripts/displayPanels.js
@@ -12,6 +12,9 @@ window.onload = function(){
   if (pageSize){
     document.getElementById('numPageItems').value = pageSize;
   }
+  var spaceType = sessionStorage.getItem("#spacesOwnership");
+  if (spaceType)
+    document.getElementById('spacesOwnership').value = spaceType;
 };
 
 function getValue(){
@@ -20,6 +23,22 @@ function getValue(){
   window.location.href = updateQueryStringParameter(url, "size", pageItems);
 };
 
+function getSpaceType(owner){
+  var type =$("#spacesOwnership").val();
+  var url = window.location.href;
+  if (type == 1) {
+    window.location.href = updateQueryStringParameter(url, "showAll", false);
+    sessionStorage.setItem("#spacesOwnership", "1");
+  } else if (type == 2) {
+    window.location.href = updateQueryStringParameter(url, "owner", owner);
+    sessionStorage.setItem("#spacesOwnership", "2");
+  } else {
+    window.location.href = url.substring(0, url.indexOf("?"));
+    sessionStorage.setItem("#spacesOwnership", "3");
+  }
+  updatePage();
+};
+
 function updateQueryStringParameter(uri, key, value) {
   var re = new RegExp("([?&])" + key + "=.*?(&|#|$)", "i");
   if( value === undefined ) {

From 2644b1b29ec66b6c1de4f692cdcd72602012968e Mon Sep 17 00:00:00 2001
From: Dipannita Dey <ddey2@illinois.edu>
Date: Thu, 8 Sep 2022 16:48:22 -0500
Subject: [PATCH 2/2] set the proper select option

---
 app/views/main.scala.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/main.scala.html b/app/views/main.scala.html
index 2e580ab1a..5bd618415 100644
--- a/app/views/main.scala.html
+++ b/app/views/main.scala.html
@@ -84,7 +84,7 @@
                                 <li><a href="@routes.Datasets.list(showPublic=false)"><span class="glyphicon glyphicon-briefcase"></span> @Messages("datasets.title")</a></li>
                                 <li><a href="@routes.Collections.list(showPublic=false)"><span class="glyphicon glyphicon-th-large"></span> @Messages("collections.title")</a></li>
                             } else {
-                                <li><a href="@routes.Spaces.list(owner=Some(user.get.id.stringify))"><span class="glyphicon glyphicon-hdd"></span> @Messages("spaces.title")</a></li>
+                                <li onclick="setMySpaceTypeSessionStorage()"><a href="@routes.Spaces.list(owner=Some(user.get.id.stringify))"><span class="glyphicon glyphicon-hdd"></span> @Messages("spaces.title")</a></li>
                                 <li><a href="@routes.Datasets.list(owner=Some(user.get.id.stringify))"><span class="glyphicon glyphicon-briefcase"></span> @Messages("datasets.title")</a></li>
                                 <li><a href="@routes.Collections.list(owner=Some(user.get.id.stringify))"><span class="glyphicon glyphicon-th-large"></span> @Messages("collections.title")</a></li>
                             }
@@ -96,7 +96,7 @@
                             Explore <b class="caret"></b>
                         </a>
                         <ul class="dropdown-menu">
-                            <li><a href="@routes.Spaces.list()"><span class="glyphicon glyphicon-hdd"> </span> @Messages("spaces.title")</a></li>
+                            <li><a href="@routes.Spaces.list(showAll=false)"><span class="glyphicon glyphicon-hdd"> </span> @Messages("spaces.title")</a></li>
                             @user match {
                                 case Some(x) => {
                                     @if(play.Play.application().configuration().getBoolean("verifySpaces") && api.Permission.checkServerAdmin(user)) {
@@ -324,6 +324,10 @@
         $.cookie("superAdmin", $.cookie("superAdmin") != "true", { path: '/' });
         location.reload();
     }
+
+    function setMySpaceTypeSessionStorage (){
+        sessionStorage.setItem("#spacesOwnership", "2");
+    }
 </script>
 
 <script>