From b9b21d511824739167d6003af132f1b7dabd40b2 Mon Sep 17 00:00:00 2001
From: MillenniumFalconMechanic <mim@clevercanary.com>
Date: Tue, 20 Apr 2021 11:07:32 -0700
Subject: [PATCH] Added project shortname to filter. Resolves #1653.

---
 spa/src/app/files/_ngrx/files.effects.ts                      | 2 +-
 spa/src/app/files/_ngrx/search/search.selectors.ts            | 3 +--
 spa/src/app/files/entity/entity-request.service.ts            | 3 +--
 .../files/facet/file-facet/file-facet-name-display.model.ts   | 1 +
 .../app/files/search/http/search-term-http.service.spec.ts    | 4 ++--
 spa/src/app/files/search/http/search-term-http.service.ts     | 1 +
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/spa/src/app/files/_ngrx/files.effects.ts b/spa/src/app/files/_ngrx/files.effects.ts
index f4ce040ec..9cf06dc9d 100644
--- a/spa/src/app/files/_ngrx/files.effects.ts
+++ b/spa/src/app/files/_ngrx/files.effects.ts
@@ -248,6 +248,6 @@ export class FilesEffects {
      */
     private isAnyProjectSelected(searchTermsByFacetName: Map<string, Set<SearchTerm>>): boolean {
 
-        return searchTermsByFacetName.has(FileFacetName.PROJECT) || searchTermsByFacetName.has(FileFacetName.PROJECT_ID);
+        return searchTermsByFacetName.has(FileFacetName.PROJECT_ID);
     }
 }
diff --git a/spa/src/app/files/_ngrx/search/search.selectors.ts b/spa/src/app/files/_ngrx/search/search.selectors.ts
index 023267c84..fc3c2ddcc 100644
--- a/spa/src/app/files/_ngrx/search/search.selectors.ts
+++ b/spa/src/app/files/_ngrx/search/search.selectors.ts
@@ -30,8 +30,7 @@ export const selectSelectedSearchTermsBySearchKey = createSelector(selectSearch,
 // Selected project search terms - returns the current set of selected projects
 export const selectSelectedProjectSearchTerms = createSelector(selectSearch, (state) => {
     return state.selectedSearchTerms.filter((searchTerm: SearchTerm) => {
-        return searchTerm.getSearchKey() === FileFacetName.PROJECT ||
-            searchTerm.getSearchKey() === FileFacetName.PROJECT_ID;
+            return searchTerm.getSearchKey() === FileFacetName.PROJECT_ID;
     });
 });
 
diff --git a/spa/src/app/files/entity/entity-request.service.ts b/spa/src/app/files/entity/entity-request.service.ts
index 94b7b793e..769197a6d 100644
--- a/spa/src/app/files/entity/entity-request.service.ts
+++ b/spa/src/app/files/entity/entity-request.service.ts
@@ -109,7 +109,7 @@ export class EntityRequestService {
     }
 
     /**
-     * Remove project facet and/or project IDs from list of search terms as we do not want to restrict the table result
+     * Remove project ID facet from list of search terms as we do not want to restrict the table result
      * set to just the selected project.
      *
      * @param {Map<string, Set<SearchTerm>>} searchTermsByFacetName
@@ -120,7 +120,6 @@ export class EntityRequestService {
         searchTermsByFacetName: Map<string, Set<SearchTerm>>, selectedEntity: string): Map<string, Set<SearchTerm>> {
 
         const filteredSearchTerms = new Map(searchTermsByFacetName);
-        filteredSearchTerms.delete(FileFacetName.PROJECT);
         filteredSearchTerms.delete(FileFacetName.PROJECT_ID);
         return filteredSearchTerms;
     }
diff --git a/spa/src/app/files/facet/file-facet/file-facet-name-display.model.ts b/spa/src/app/files/facet/file-facet/file-facet-name-display.model.ts
index 2c2df999d..5bc9a7f01 100644
--- a/spa/src/app/files/facet/file-facet/file-facet-name-display.model.ts
+++ b/spa/src/app/files/facet/file-facet/file-facet-name-display.model.ts
@@ -9,6 +9,7 @@
 export enum FileFacetNameDisplay {
     "disease" = "Disease Status",
     "libraryConstructionApproach" = "Library Construction Method",
+    "project" = "Project Label",
     "projectId" = "Project",
     "sampleEntityType" = "Sample Type",
     "specimenOrgan" = "Organ",
diff --git a/spa/src/app/files/search/http/search-term-http.service.spec.ts b/spa/src/app/files/search/http/search-term-http.service.spec.ts
index e499de0bd..4b7bc14a2 100644
--- a/spa/src/app/files/search/http/search-term-http.service.spec.ts
+++ b/spa/src/app/files/search/http/search-term-http.service.spec.ts
@@ -42,12 +42,12 @@ describe("SearchTermHttpService:", () => {
         /**
          * Confirm project facet is not added as a search term.
          */
-        it("excludes project facet from search terms", () => {
+        it("binds project facet in search terms", () => {
 
             const searchTerms = searchTermHttpService.bindSearchTerms(PROJECTS_ENTITY_API_RESPONSE.termFacets);
             expect(searchTerms).toBeTruthy();
             const projectSearchTerm = searchTerms.find((searchTerm) => searchTerm.facetName === FileFacetName.PROJECT);
-            expect(projectSearchTerm).toBeFalsy();
+            expect(projectSearchTerm).toBeTruthy();
         });
 
 
diff --git a/spa/src/app/files/search/http/search-term-http.service.ts b/spa/src/app/files/search/http/search-term-http.service.ts
index e9a2edac8..a768f3c4e 100644
--- a/spa/src/app/files/search/http/search-term-http.service.ts
+++ b/spa/src/app/files/search/http/search-term-http.service.ts
@@ -40,6 +40,7 @@ export class SearchTermHttpService {
         "organismAgeValue",
         "pairedEnd",
         "preservationMethod",
+        "project",
         "projectTitle",
         "publicationTitle",
         "sampleDisease",