Merge pull request #2681 from magda-io/2658-search-dropdown

Search dropdown
magda-io · Jan 6, 2020 · da15a87 · da15a87
2 parents 84d8c6f + 2b84a5d
commit da15a87
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -146,6 +146,7 @@ UI:
 -   Removed help icons without content
 -   Made read-only calls to the registry api use `/registry-read-only`.
 -   Fixed: if featureFlags are not set, edit buttons are always shown on dataset page
+-   Add specific color to recent search item text
 
 Gateway:
 

diff --git a/magda-web-client/src/Components/Account/AccountPage.js b/magda-web-client/src/Components/Account/AccountPage.js
@@ -27,14 +27,14 @@ class Account extends React.Component {
     renderRoles() {
         const user = this.props.user;
         return (
-            <p>
+            <div>
                 Roles:{" "}
                 {user.roles && user.roles.length ? (
                     <ul>{user.roles.map(role => this.renderRole(role))}</ul>
                 ) : (
                     "N/A"
                 )}
-            </p>
+            </div>
         );
     }
 
@@ -110,7 +110,7 @@ class Account extends React.Component {
                             <p>Email: {this.props.user.email}</p>
                             {this.renderRoles()}
                             {this.props.user.isAdmin && (
-                                <a href="/admin" class="au-btn">
+                                <a href="/admin" className="au-btn">
                                     Administrate
                                 </a>
                             )}

diff --git a/magda-web-client/src/Components/Dataset/Search/Results/DatasetSummary.js b/magda-web-client/src/Components/Dataset/Search/Results/DatasetSummary.js
@@ -89,7 +89,7 @@ export default class DatasetSummary extends Component {
         datasetSummaryItems = datasetSummaryItems.reduce(
             (arr, nextSummaryItem, idx) =>
                 idx < datasetSummaryItems.length - 1
-                    ? [...arr, nextSummaryItem, <Divider />]
+                    ? [...arr, nextSummaryItem, <Divider key={idx} />]
                     : [...arr, nextSummaryItem],
             []
         );

diff --git a/magda-web-client/src/Components/Dataset/Search/SearchSuggestionBox.scss b/magda-web-client/src/Components/Dataset/Search/SearchSuggestionBox.scss
@@ -38,6 +38,9 @@
             width: calc(100% - 50px);
             text-align: left;
             padding: 0px;
+            &.search-item-main-button {
+                color: $AU-color-foreground-action;
+            }
             &.markdown {
                 margin-left: 0;
                 em {

diff --git a/magda-web-client/src/Components/Dataset/Search/SearchSuggestionBox.tsx b/magda-web-client/src/Components/Dataset/Search/SearchSuggestionBox.tsx
@@ -70,10 +70,10 @@ class SearchSuggestionBox extends Component<Props & any, any> {
             manuallyHidden: false
         };
         this.cacheImgs();
-        this.createSearchDataFromProps(this.props);
         this.searchInputRef = null;
         this.onSearchInputKeyDown = this.onSearchInputKeyDown.bind(this);
         this.containerRef = null;
+        this.saveRecentSearch(this.props);
     }
 
     cacheImgs() {
@@ -142,7 +142,7 @@ class SearchSuggestionBox extends Component<Props & any, any> {
         return qStr ? qStr + " " + filters.join("; ") : filters.join("; ");
     }
 
-    saveRecentSearch(newProps, prevProps) {
+    saveRecentSearch(newProps, prevProps?) {
         const searchData = this.createSearchDataFromProps(newProps);
         if (!searchData) return;
         if (
@@ -392,7 +392,7 @@ class SearchSuggestionBox extends Component<Props & any, any> {
                         role="listbox"
                         className="search-history-items"
                     >
-                        {recentSearchItems.map((item, idx) => (
+                        {recentSearchItems.map((item, idx: number) => (
                             <li
                                 key={idx}
                                 className={`search-item-container ${