From 41b453b1a60df934c3285de93a520273c39dabcd Mon Sep 17 00:00:00 2001 From: Lisa-Ann B Date: Mon, 27 Nov 2023 11:00:47 -0500 Subject: [PATCH 1/4] Remove unnecessary Spinner in BodyContent - #1048 --- src/components/custom/search/BodyContent.jsx | 1 - src/search-ui | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/custom/search/BodyContent.jsx b/src/components/custom/search/BodyContent.jsx index c43dff87..bab5232a 100644 --- a/src/components/custom/search/BodyContent.jsx +++ b/src/components/custom/search/BodyContent.jsx @@ -13,7 +13,6 @@ function BodyContent({ view }) { data-ada-data='{"trigger": ".rdt_TableCell", "tabIndex": ".rdt_TableRow"}' > {wasSearched && } - {!wasSearched && } ) } diff --git a/src/search-ui b/src/search-ui index 3338d827..13f5de10 160000 --- a/src/search-ui +++ b/src/search-ui @@ -1 +1 @@ -Subproject commit 3338d82738ddcf7b0802f613b9fcfba3baa2199a +Subproject commit 13f5de101c68005be8a28ed742b68396b47afaee From d3ce0f7090828842bdf63866336d6ba54cb10bf8 Mon Sep 17 00:00:00 2001 From: Lisa-Ann B Date: Mon, 27 Nov 2023 14:34:17 -0500 Subject: [PATCH 2/4] Replenish component, remove css - #1048 --- src/components/custom/search/BodyContent.jsx | 1 + src/sass/components/sui.scss | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/components/custom/search/BodyContent.jsx b/src/components/custom/search/BodyContent.jsx index bab5232a..c43dff87 100644 --- a/src/components/custom/search/BodyContent.jsx +++ b/src/components/custom/search/BodyContent.jsx @@ -13,6 +13,7 @@ function BodyContent({ view }) { data-ada-data='{"trigger": ".rdt_TableCell", "tabIndex": ".rdt_TableRow"}' > {wasSearched && } + {!wasSearched && } ) } diff --git a/src/sass/components/sui.scss b/src/sass/components/sui.scss index 95f4a1cf..071822a8 100644 --- a/src/sass/components/sui.scss +++ b/src/sass/components/sui.scss @@ -217,13 +217,6 @@ .sui-resultsTable { min-height: 400px; - @include xlg { - .spinner-wrapper { - position: absolute; - top: 30%; right: 45%; - transform: translate(50%,-50%); - } - } } #sui-tbl-checkbox-actions { From 85c79a92c024c7498d1bee536dd870e2df81d4c3 Mon Sep 17 00:00:00 2001 From: Lisa-Ann B Date: Tue, 28 Nov 2023 13:10:17 -0500 Subject: [PATCH 3/4] Add tutorial step - #1047 --- src/components/custom/layout/TutorialSteps.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/components/custom/layout/TutorialSteps.js b/src/components/custom/layout/TutorialSteps.js index 7417699d..bf58bd12 100644 --- a/src/components/custom/layout/TutorialSteps.js +++ b/src/components/custom/layout/TutorialSteps.js @@ -1,7 +1,7 @@ import React from "react"; function TutorialSteps(loggedIn) { - const stepsCount = loggedIn ? 6 : 4 + const stepsCount = loggedIn ? 7 : 5 let _steps = [ { target: '#search', @@ -9,19 +9,24 @@ function TutorialSteps(loggedIn) { title: Search Entities by Free Text (1/{stepsCount}), content: 'To further narrow the relevant entities, type search terms or phrases into the Search bar. Entities containing any of the search terms will be returned.' }, + { + target: '#searchDropdown', + title: Search Entities or Metadata (2/{stepsCount}), + content: 'The default option to search by entities allows you to filter results based on the core properties of various entity types. You can also search and filter the metadata that has been submitted to registered entities.', + }, { target: '.sui-facet', - title: Filter Your Browsing (2/{stepsCount}), + title: Filter Your Browsing (3/{stepsCount}), content: 'The faceted search options on the left side allows filtering entities by any combination of categories. Search results update automatically as you edit the selection of filters.', }, { target: '[data-column-id="2"].rdt_TableCol', - title: Sort Search Results (3/{stepsCount}), + title: Sort Search Results (4/{stepsCount}), content: 'Clicking the header of any column will sort search results. A bolded arrow indicates the current sorting selection. Clicking again will reverse the order.' }, { target: '#sui-tbl-checkbox-actions', - title: Download Search Results (4/{stepsCount}), + title: Download Search Results (5/{stepsCount}), content: Clicking on the checkboxes on the left side of the search results table allows selecting distinct entities for export. Clicking on the ellipsis at the top of the search results table allows for exporting either only the selected entities or all entities in the table to a JSON or TSV format. From 64b3201c5fd122331cbd0b3afddd9dfa66cc7ad5 Mon Sep 17 00:00:00 2001 From: Lisa-Ann B Date: Wed, 29 Nov 2023 09:18:39 -0500 Subject: [PATCH 4/4] Fix step number --- src/components/custom/layout/TutorialSteps.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/custom/layout/TutorialSteps.js b/src/components/custom/layout/TutorialSteps.js index bf58bd12..4e63ad12 100644 --- a/src/components/custom/layout/TutorialSteps.js +++ b/src/components/custom/layout/TutorialSteps.js @@ -35,13 +35,13 @@ function TutorialSteps(loggedIn) { if (loggedIn){ _steps.push({ target: '#nav-dropdown', - title: Registering entities (5/{stepsCount}), + title: Registering entities (6/{stepsCount}), content: You may register individual and bulk entities by clicking on this menu. Then selecting under Single for single registration or under Bulk for bulk registration. }) _steps.push({ target: '#nav-dropdown--bulkMetadata', - title: Bulk uploading metadata (6/{stepsCount}), + title: Bulk uploading metadata (7/{stepsCount}), content: Select this menu to bulk upload metadata.
Note: You may also upload metadata for a single entity during registration. See previous step for details. }) }