From 765f0c50550580b48015f442d28e23bfffbaf845 Mon Sep 17 00:00:00 2001 From: Devon Sumner Date: Tue, 16 Aug 2022 16:38:29 -0600 Subject: [PATCH] DMND-950 + DMND-1041: Now add found RSDs to collection works as expected. --- .../app/search/rich-skill-search-results.component.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ui/src/app/search/rich-skill-search-results.component.ts b/ui/src/app/search/rich-skill-search-results.component.ts index 886d36e30..8afb4b51a 100644 --- a/ui/src/app/search/rich-skill-search-results.component.ts +++ b/ui/src/app/search/rich-skill-search-results.component.ts @@ -22,6 +22,7 @@ export class RichSkillSearchResultsComponent extends SkillsListComponent impleme title = "Search Results" + selectAllChecked = false showSearchEmptyMessage = true private multiplePagesSelected: boolean = false @@ -80,6 +81,7 @@ export class RichSkillSearchResultsComponent extends SkillsListComponent impleme handleSelectAll(selectAllChecked: boolean): void { this.multiplePagesSelected = this.totalPageCount > 1 + this.selectAllChecked = selectAllChecked } getSelectAllCount(): number { @@ -87,11 +89,14 @@ export class RichSkillSearchResultsComponent extends SkillsListComponent impleme } handleClickAddCollection(action: TableActionDefinition, skill?: ApiSkillSummary): boolean { + const selectedSkills = this.getSelectedSkills(skill) + this.router.navigate(["/collections/add-skills"], { + // If there are selected skills, use them. Otherwise, use the search results. state: { - selectedSkills: this.getSelectedSkills(skill), - totalCount: this.totalCount, - search: this.apiSearch + selectedSkills, + totalCount: this.selectAllChecked || !selectedSkills?.length ? this.totalCount : selectedSkills?.length, + search: this.selectAllChecked || !selectedSkills?.length ? this.apiSearch : undefined } as ExtrasSelectedSkillsState }) return false