"Back" now works for search results (#3)

- Made the application only retrieve the list of continents once per visit
- Update the verbiage for phase 3 completion

src/JobsJobsJobs/Client/AppState.cs

@@ -1,5 +1,8 @@
 using JobsJobsJobs.Shared;
 using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading.Tasks;
 
 namespace JobsJobsJobs.Client
 {
@@ -45,6 +48,33 @@ namespace JobsJobsJobs.Client
             }
         }
 
+        private IEnumerable<Continent>? _continents = null;
+
+        /// <summary>
+        /// Get a list of continents (only retrieves once per application load)
+        /// </summary>
+        /// <param name="http">The HTTP client to use to obtain continents the first time</param>
+        /// <returns>The list of continents</returns>
+        /// <exception cref="ApplicationException">If the continents cannot be loaded</exception>
+        public async Task<IEnumerable<Continent>> GetContinents(HttpClient http)
+        {
+            if (_continents == null)
+            {
+                ServerApi.SetJwt(http, this);
+                var continentResult = await ServerApi.RetrieveMany<Continent>(http, "continent/all");
+
+                if (continentResult.IsOk)
+                {
+                    _continents = continentResult.Ok;
+                }
+                else
+                {
+                    throw new ApplicationException($"Could not load continents - {continentResult.Error}");
+                }
+            }
+            return _continents;
+        }
+
         public AppState() { }
 
         private void NotifyChanged() => OnChange.Invoke();

src/JobsJobsJobs/Client/Pages/Citizen/Dashboard.razor

@@ -28,29 +28,30 @@ else
         started!
       </p>
     }
-    @{
-        /**
-        This is phase 3 stuff...
     <hr>
     <p>
       There @(ProfileCount == 1 ? "is" : "are") @(ProfileCount == 0 ? "no" : ProfileCount) employment
       profile@(ProfileCount != 1 ? "s" : "") from citizens of Gitmo Nation.
       @if (ProfileCount > 0)
       {
-        <text>Take a look around and see if you can help them find work!</text> <em>(coming soon)</em>
+        <text>Take a look around and see if you can help them find work!</text>
       }
-    </p> */
-    }
+    </p>
   </ErrorList>
 }
 <hr>
-<h4>Phase 3 &ndash; What Works <small><em>(<span class="text-uppercase">In Progress</span> ~~ Last Updated January 10<sup>th</sup>, 2021)</em></small></h4>
+<h4>
+  <a href="https://github.com/bit-badger/jobs-jobs-jobs/issues/3" target="_blank">Phase 3</a> &ndash; What Works
+  <small><em>(v0.8 &ndash; Last Updated January 19<sup>th</sup>, 2021)</em></small>
+</h4>
 <p>
-  The &ldquo;View Profiles&rdquo; link at the side does not have any search capabilities, but it does provide a list of
-  citizens who have filled out profiles, along with a way to view those profiles.
+  The &ldquo;View Profiles&rdquo; link at the side now allows you to search for profiles by continent, the
+  citizen&rsquo;s desire for remote work, a skill, or any text in their professional biography and experience. If you
+  find someone with whom you&rsquo;d like to discuss potential opportunities, the name at the top of the profile links
+  to their No Agenda Social account, where you can use its features to get in touch.
 </p>
 <hr>
-<h4>Phase 2 &ndash; What Works <small><em>(Last Updated January 8<sup>th</sup>, 2021)</em></small></h4>
+<h4>Phase 2 &ndash; What Works <small><em>(v0.7 &ndash; Last Updated January 8<sup>th</sup>, 2021)</em></small></h4>
 <p>
   If you&rsquo;ve gotten this far, you&rsquo;ve already passed
   <a href="https://github.com/bit-badger/jobs-jobs-jobs/issues/1" target="_blank">Phase 1</a>, which enabled users of

src/JobsJobsJobs/Client/Pages/Citizen/EditProfile.razor

@@ -28,9 +28,9 @@
             <InputSelect id="continentId" @bind-Value=@ProfileForm.ContinentId class="form-control">
               <option>&ndash; Select &ndash;</option>
               @foreach (var (id, name) in Continents)
-          {
-          <option value="@id">@name</option>
-    }
+              {
+                <option value="@id">@name</option>
+              }
             </InputSelect>
             <ValidationMessage For=@(() => ProfileForm.ContinentId) />
           </div>

src/JobsJobsJobs/Client/Pages/Citizen/EditProfile.razor.cs

@@ -46,19 +46,12 @@ namespace JobsJobsJobs.Client.Pages.Citizen
         protected override async Task OnInitializedAsync()
         {
             ServerApi.SetJwt(http, state);
-            var continentTask = ServerApi.RetrieveMany<Continent>(http, "continent/all");
+            var continentTask = state.GetContinents(http);
             var profileTask = ServerApi.RetrieveProfile(http, state);
 
             await Task.WhenAll(continentTask, profileTask);
 
-            if (continentTask.Result.IsOk)
-            {
-                Continents = continentTask.Result.Ok;
-            }
-            else
-            {
-                ErrorMessages.Add(continentTask.Result.Error);
-            }
+            Continents = continentTask.Result;
 
             if (profileTask.Result.IsOk)
             {

src/JobsJobsJobs/Client/Pages/Profile/Search.razor

@@ -1,5 +1,6 @@
 @page "/profile/search"
 @inject HttpClient http
+@inject NavigationManager nav
 @inject AppState state
 
 <PageTitle Title="Search Profiles" />
@@ -12,6 +13,14 @@
   }
   else
   {
+    if (!Searched)
+    {
+      <p>Enter one or more criteria to filter results, or just click &ldquo;Search&rdquo; to list all profiles.</p>
+    }
+    <Collapsible HeaderText="Search Criteria" Collapsed=@(Searched && SearchResults.Any())>
+      <ProfileSearchForm Criteria=@Criteria OnSearch=@DoSearch Continents=@Continents />
+    </Collapsible>
+    <br>
     @if (SearchResults.Any())
     {
       <table class="table table-sm table-hover">
@@ -40,5 +49,9 @@
         </tbody>
       </table>
     }
+    else if (Searched)
+    {
+      <p>No results found for the specified criteria</p>
+    }
   }
 </ErrorList>

src/JobsJobsJobs/Client/Pages/Profile/Search.razor.cs

@@ -1,9 +1,11 @@
 using JobsJobsJobs.Shared;
 using JobsJobsJobs.Shared.Api;
 using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.WebUtilities;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using System.Threading.Tasks;
 
 namespace JobsJobsJobs.Client.Pages.Profile
@@ -20,6 +22,11 @@ namespace JobsJobsJobs.Client.Pages.Profile
         /// </summary>
         private bool Searching { get; set; } = false;
 
+        /// <summary>
+        /// The search criteria
+        /// </summary>
+        private ProfileSearch Criteria { get; set; } = new ProfileSearch();
+
         /// <summary>
         /// Error messages encountered while searching for profiles
         /// </summary>
@@ -37,19 +44,36 @@ namespace JobsJobsJobs.Client.Pages.Profile
 
         protected override async Task OnInitializedAsync()
         {
-            ServerApi.SetJwt(http, state);
-            var continentResult = await ServerApi.RetrieveMany<Continent>(http, "continent/all");
+            Continents = await state.GetContinents(http);
 
-            if (continentResult.IsOk)
-            {
-                Continents = continentResult.Ok;
-            }
-            else
-            {
-                ErrorMessages.Add(continentResult.Error);
-            }
+            // Determine if we have searched before
+            var query = QueryHelpers.ParseQuery(nav.ToAbsoluteUri(nav.Uri).Query);
 
-            // TODO: remove this call once the filter is ready
+            if (query.TryGetValue("Searched", out var searched))
+            {
+                Searched = Convert.ToBoolean(searched);
+                void setPart(string part, Action<string> func)
+                {
+                    if (query.TryGetValue(part, out var partValue)) func(partValue);
+                }
+                setPart("ContinentId", x => Criteria.ContinentId = x);
+                setPart("Skill", x => Criteria.Skill = x);
+                setPart("BioExperience", x => Criteria.BioExperience = x);
+                setPart("RemoteWork", x => Criteria.RemoteWork = x);
+
+                await RetrieveProfiles();
+            }
+        }
+
+        /// <summary>
+        /// Do a search
+        /// </summary>
+        /// <remarks>This navigates with the parameters in the URL; this should trigger a search</remarks>
+        private async Task DoSearch()
+        {
+            var query = SearchQuery();
+            query.Add("Searched", "True");
+            nav.NavigateTo(QueryHelpers.AddQueryString("/profile/search", query));
             await RetrieveProfiles();
         }
 
@@ -60,8 +84,8 @@ namespace JobsJobsJobs.Client.Pages.Profile
         {
             Searching = true;
 
-            // TODO: send a filter with this request
-            var searchResult = await ServerApi.RetrieveMany<ProfileSearchResult>(http, "profile/search");
+            var searchResult = await ServerApi.RetrieveMany<ProfileSearchResult>(http,
+                QueryHelpers.AddQueryString("profile/search", SearchQuery()));
 
             if (searchResult.IsOk)
             {
@@ -85,5 +109,27 @@ namespace JobsJobsJobs.Client.Pages.Profile
         /// <param name="condition">The condition in question</param>
         /// <returns>"Yes" for true, "No" for false</returns>
         private static string YesOrNo(bool condition) => condition ? "Yes" : "No";
+
+        /// <summary>
+        /// Create a search query string from the currently-entered criteria
+        /// </summary>
+        /// <returns>The query string for the currently-entered criteria</returns>
+        private IDictionary<string, string?> SearchQuery()
+        {
+            var dict = new Dictionary<string, string?>();
+            if (Criteria.IsEmptySearch) return dict;
+
+            void part(string name, Func<ProfileSearch, string?> func)
+            {
+                if (!string.IsNullOrEmpty(func(Criteria))) dict.Add(name, func(Criteria));
+            }
+
+            part("ContinentId", it => it.ContinentId);
+            part("Skill", it => it.Skill);
+            part("BioExperience", it => it.BioExperience);
+            part("RemoteWork", it => it.RemoteWork);
+
+            return dict;
+        }
     }
 }

src/JobsJobsJobs/Client/Shared/Collapsible.razor

@@ -0,0 +1,25 @@
+<div class="card">
+  <div class="card-header">
+    <a href="#" class="@(Collapsed ? "jjj-c-collapsed" : "jjj-c-open")"
+       @onclick=@Toggle @onclick:preventDefault>
+      @HeaderText
+    </a>
+  </div>
+  @if (!Collapsed)
+  {
+    <div class="card-body">@ChildContent</div>
+  }
+</div>
+
+@code {
+    [Parameter]
+    public RenderFragment ChildContent { get; set; } = default!;
+
+    [Parameter]
+    public bool Collapsed { get; set; } = false;
+
+    [Parameter]
+    public string HeaderText { get; set; } = "Toggle";
+
+    private void Toggle() => Collapsed = !Collapsed;
+}

src/JobsJobsJobs/Client/Shared/Collapsible.razor.css

@@ -0,0 +1,16 @@
+a.jjj-c-collapsed,
+a.jjj-c-open {
+  text-decoration: none;
+  font-weight: bold;
+  color: black;
+}
+a.jjj-c-collapsed:hover,
+a.jjj-c-open:hover {
+  cursor: pointer;
+}
+.jjj-c-collapsed::before {
+  content: '\2b9e \00a0';
+}
+.jjj-c-open::before {
+  content: '\2b9f \00a0';
+}

src/JobsJobsJobs/Client/Shared/ProfileSearchForm.razor

@@ -0,0 +1,60 @@
+@using JobsJobsJobs.Shared.Api
+
+<EditForm Model=@Criteria OnValidSubmit=@OnSearch>
+  <div class="form-row">
+    <div class="col col-12 col-sm-6 col-md-4 col-lg-3">
+      <label for="continentId" class="jjj-label">Continent</label>
+      <InputSelect id="continentId" @bind-Value=@Criteria.ContinentId class="form-control form-control-sm">
+        <option value="">&ndash; Any &ndash;</option>
+        @foreach (var (id, name) in Continents)
+        {
+          <option value="@id">@name</option>
+        }
+      </InputSelect>
+    </div>
+    <div class="col col-12 col-sm-6 offset-md-2 col-lg-3 offset-lg-0">
+      <label class="jjj-label">Seeking Remote Work?</label><br>
+      <InputRadioGroup @bind-Value=@Criteria.RemoteWork>
+        <div class="form-check form-check-inline">
+          <InputRadio id="remoteNull" Value=@("") class="form-check-input" />
+          <label for="remoteNull" class="form-check-label">No Selection</label>
+        </div>
+        <div class="form-check form-check-inline">
+          <InputRadio id="remoteYes" Value=@("yes") class="form-check-input" />
+          <label for="remoteYes" class="form-check-label">Yes</label>
+        </div>
+        <div class="form-check form-check-inline">
+          <InputRadio id="remoteNo" Value=@("no") class="form-check-input" />
+          <label for="remoteNo" class="form-check-label">No</label>
+        </div>
+      </InputRadioGroup>
+    </div>
+    <div class="col col-12 col-sm-6 col-lg-3">
+      <label for="skillSearch" class="jjj-label">Skill</label>
+      <InputText id="skillSearch" @bind-Value=@Criteria.Skill class="form-control form-control-sm"
+                 placeholder="(free-form text)" />
+    </div>
+    <div class="col col-12 col-sm-6 col-lg-3">
+      <label for="bioSearch" class="jjj-label">Bio / Experience</label>
+      <InputText id="bioSearch" @bind-Value=@Criteria.BioExperience class="form-control form-control-sm"
+                 placeholder="(free-form text)" />
+    </div>
+  </div>
+  <div class="form-row">
+    <div class="col">
+      <br>
+      <button type="submit" class="btn btn-sm btn-outline-primary">Search</button>
+    </div>
+  </div>
+</EditForm>
+
+@code {
+    [Parameter]
+    public ProfileSearch Criteria { get; set; } = default!;
+
+    [Parameter]
+    public EventCallback OnSearch { get; set; } = default!;
+
+    [Parameter]
+    public IEnumerable<Continent> Continents { get; set; } = default!;
+}

src/JobsJobsJobs/Client/wwwroot/css/app.css

@@ -65,3 +65,7 @@ label.jjj-required::after {
   color: red;
   content: ' *';
 }
+
+label.jjj-label {
+  font-style: italic;
+}

src/JobsJobsJobs/Directory.Build.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
     <Nullable>enable</Nullable>
-    <AssemblyVersion>0.7.1.0</AssemblyVersion>
-    <FileVersion>0.7.1.0</FileVersion>
+    <AssemblyVersion>0.8.0.0</AssemblyVersion>
+    <FileVersion>0.8.0.0</FileVersion>
   </PropertyGroup>
 </Project>

src/JobsJobsJobs/Server/Areas/Api/Controllers/ProfileController.cs

@@ -112,9 +112,7 @@ namespace JobsJobsJobs.Server.Areas.Api.Controllers
         }
 
         [HttpGet("search")]
-        public async Task<IActionResult> Search()
-        {
-            return Ok(await _db.SearchProfiles());
-        }
+        public async Task<IActionResult> Search([FromQuery] ProfileSearch search) =>
+            Ok(await _db.SearchProfiles(search));
     }
 }

src/JobsJobsJobs/Server/Data/ProfileExtensions.cs

@@ -115,12 +115,51 @@ namespace JobsJobsJobs.Server.Data
         /// </summary>
         //  TODO: A criteria parameter!
         /// <returns>The information for profiles matching the criteria</returns>
-        public static async Task<IEnumerable<ProfileSearchResult>> SearchProfiles(this JobsDbContext db)
+        public static async Task<IEnumerable<ProfileSearchResult>> SearchProfiles(this JobsDbContext db,
+            ProfileSearch search)
         {
-            return await db.Profiles
-                .Join(db.Citizens, p => p.Id, c => c.Id, (p, c) => new { Profile = p, Citizen = c })
-                .Select(x => new ProfileSearchResult(x.Citizen.Id, x.Citizen.DisplayName, x.Profile.SeekingEmployment,
-                    x.Profile.RemoteWork, x.Profile.FullTime, x.Profile.LastUpdatedOn))
+            var query = db.Profiles
+                .Join(db.Citizens, p => p.Id, c => c.Id, (p, c) => new { Profile = p, Citizen = c });
+
+            var useIds = false;
+            var citizenIds = new List<CitizenId>();
+
+            if (!string.IsNullOrEmpty(search.ContinentId))
+            {
+                query = query.Where(it => it.Profile.ContinentId == ContinentId.Parse(search.ContinentId));
+            }
+
+            if (!string.IsNullOrEmpty(search.RemoteWork))
+            {
+                query = query.Where(it => it.Profile.RemoteWork == (search.RemoteWork == "yes"));
+            }
+
+            if (!string.IsNullOrEmpty(search.Skill))
+            {
+                useIds = true;
+                citizenIds.AddRange(await db.Skills
+                    .Where(s => s.Description.ToLower().Contains(search.Skill.ToLower()))
+                    .Select(s => s.CitizenId)
+                    .ToListAsync().ConfigureAwait(false));
+            }
+
+            if (!string.IsNullOrEmpty(search.BioExperience))
+            {
+                useIds = true;
+                citizenIds.AddRange(await db.Profiles
+                    .FromSqlRaw("SELECT citizen_id FROM profile WHERE biography ILIKE {0} OR experience ILIKE {0}",
+                        $"%{search.BioExperience}%")
+                    .Select(p => p.Id)
+                    .ToListAsync().ConfigureAwait(false));
+            }
+
+            if (useIds)
+            {
+                query = query.Where(it => citizenIds.Contains(it.Citizen.Id));
+            }
+
+            return await query.Select(x => new ProfileSearchResult(x.Citizen.Id, x.Citizen.DisplayName,
+                x.Profile.SeekingEmployment, x.Profile.RemoteWork, x.Profile.FullTime, x.Profile.LastUpdatedOn))
                 .ToListAsync().ConfigureAwait(false);
         }
     }

src/JobsJobsJobs/Shared/Api/ProfileSearch.cs

@@ -0,0 +1,37 @@
+namespace JobsJobsJobs.Shared.Api
+{
+    /// <summary>
+    /// The various ways profiles can be searched
+    /// </summary>
+    public class ProfileSearch
+    {
+        /// <summary>
+        /// Retrieve citizens from this continent
+        /// </summary>
+        public string? ContinentId { get; set; }
+
+        /// <summary>
+        /// Text for a search within a citizen's skills
+        /// </summary>
+        public string? Skill { get; set; }
+
+        /// <summary>
+        /// Text for a search with a citizen's professional biography and experience fields
+        /// </summary>
+        public string? BioExperience { get; set; }
+
+        /// <summary>
+        /// Whether to retrieve citizens who do or do not want remote work
+        /// </summary>
+        public string RemoteWork { get; set; } = "";
+
+        /// <summary>
+        /// Is the search empty?
+        /// </summary>
+        public bool IsEmptySearch =>
+            string.IsNullOrEmpty(ContinentId)
+            && string.IsNullOrEmpty(Skill)
+            && string.IsNullOrEmpty(BioExperience)
+            && string.IsNullOrEmpty(RemoteWork);
+    }
+}

src/JobsJobsJobs/Shared/Result.cs

@@ -1,4 +1,6 @@
-namespace JobsJobsJobs.Shared
+using System;
+
+namespace JobsJobsJobs.Shared
 {
     /// <summary>
     /// A result with two different possibilities
@@ -60,5 +62,24 @@
         /// <param name="error">The error message</param>
         /// <returns>The Error result</returns>
         public static Result<TOk> AsError(string error) => new Result<TOk>(false) { Error = error };
+
+        /// <summary>
+        /// Transform a result if it is OK, passing the error along if it is an error
+        /// </summary>
+        /// <param name="f">The transforming function</param>
+        /// <param name="result">The existing result</param>
+        /// <returns>The resultant result</returns>
+        public static Result<TOk> Bind(Func<TOk, Result<TOk>> f, Result<TOk> result) =>
+            result.IsOk ? f(result.Ok) : result;
+
+        /// <summary>
+        /// Transform a result to a different type if it is OK, passing the error along if it is an error
+        /// </summary>
+        /// <typeparam name="TOther">The type to which the result is transformed</typeparam>
+        /// <param name="f">The transforming function</param>
+        /// <param name="result">The existing result</param>
+        /// <returns>The resultant result</returns>
+        public static Result<TOther> Map<TOther>(Func<TOk, Result<TOther>> f, Result<TOk> result) =>
+            result.IsOk ? f(result.Ok) : Result<TOther>.AsError(result.Error);
     }
 }