@ndla/ui 3.3.12 → 3.3.13

package/lib/types.d.ts

@@ -18,9 +18,9 @@ declare type ResourceTypes = {
     name: string;
 };
 export declare type Resource = {
-    id: string;
+    id: string | number;
     name: string;
-    contentUri: string;
+    contentUri?: string;
     path: string;
     primary?: boolean;
     rank?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndla/ui",
-  "version": "3.3.12",
+  "version": "3.3.13",
   "description": "UI component library for NDLA.",
   "license": "GPL-3.0",
   "main": "lib/index.js",
@@ -92,5 +92,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ff7194a882009a1b4faddafdad34a949d4426ffb"
+  "gitHead": "15388cbdbe3dae57fef57a86f58380437b8264fc"
 }

package/src/Frontpage/FrontpageSearch.tsx

@@ -1,7 +1,6 @@
 import React, { useEffect, useRef } from 'react';
 import { isIE, browserVersion, isMobileSafari } from 'react-device-detect';
 import styled from '@emotion/styled';
-import { History } from 'history';
 import { colors, spacing, mq, breakpoints, animations } from '@ndla/core';
 // @ts-ignore
 import { noScroll } from '@ndla/util';
@@ -54,11 +53,10 @@ type Props = {
   };
   onSearch: (event: React.FormEvent) => void;
   allResultUrl: string;
-  searchResult: Array<ContentTypeResultType>;
+  searchResult?: Array<ContentTypeResultType>;
   loading: boolean;
-  history: History;
-  suggestion: string;
-  suggestionUrl: string;
+  suggestion?: string;
+  suggestionUrl?: string;
 };
 
 const FrontpageSearch: React.FunctionComponent<Props> = ({
@@ -73,7 +71,6 @@ const FrontpageSearch: React.FunctionComponent<Props> = ({
   allResultUrl,
   searchResult,
   loading,
-  history,
   suggestion,
   suggestionUrl,
 }) => {
@@ -190,7 +187,6 @@ const FrontpageSearch: React.FunctionComponent<Props> = ({
               allResultUrl={allResultUrl}
               resourceToLinkProps={resourceToLinkProps}
               infoText={t('welcomePage.searchDisclaimer')}
-              history={history}
               suggestion={suggestion}
               suggestionUrl={suggestionUrl}
             />

package/src/Search/SearchResultSleeve.tsx

@@ -7,20 +7,10 @@
  */
 
 import React, { useEffect, useRef, useState } from 'react';
-import { History } from 'history';
 import styled from '@emotion/styled';
 import { breakpoints, colors, fonts, misc, mq, spacing } from '@ndla/core';
-import {
-  ChevronDown,
-  ChevronUp,
-  Esc,
-  KeyboardReturn,
-  Search as SearchIcon,
-  Wrench,
-  // @ts-ignore
-} from '@ndla/icons/common';
+import { ChevronDown, ChevronUp, Esc, KeyboardReturn, Search as SearchIcon, Wrench } from '@ndla/icons/common';
 import SafeLink from '@ndla/safelink';
-// @ts-ignore
 import { useTranslation } from 'react-i18next';
 import ContentTypeResult from './ContentTypeResult';
 import { highlightStyle } from './ContentTypeResultStyles';
@@ -218,14 +208,13 @@ type Props = {
     to: string;
   };
   onNavigate?: VoidFunction;
-  infoText: string;
-  ignoreContentTypeBadge: boolean;
+  infoText?: string;
+  ignoreContentTypeBadge?: boolean;
   searchString: string;
   loading: boolean;
   frontpage?: boolean;
-  history: History;
-  suggestion: string;
-  suggestionUrl: string;
+  suggestion?: string;
+  suggestionUrl?: string;
 };
 
 const SearchResultSleeve: React.FC<Props> = ({
@@ -238,7 +227,6 @@ const SearchResultSleeve: React.FC<Props> = ({
   searchString,
   loading,
   frontpage,
-  history,
   suggestion,
   suggestionUrl,
 }) => {
@@ -332,7 +320,7 @@ const SearchResultSleeve: React.FC<Props> = ({
               <strong ref={searchAllRef}>{searchString}</strong>
               <small>{t('welcomePage.searchAllInfo')}</small>
             </StyledSearchLink>
-            {suggestion && (
+            {suggestion && suggestionUrl && (
               <StyledSearchLink css={keyboardPathNavigation === GO_TO_SUGGESTION && highlightStyle} to={suggestionUrl}>
                 <SearchIcon className="c-icon--22" />
                 <small>{t('searchPage.resultType.searchPhraseSuggestion')}</small>
@@ -342,7 +330,7 @@ const SearchResultSleeve: React.FC<Props> = ({
           </SearchLinkContainer>
           {result.map((contentTypeResult: ContentTypeResultType) => (
             <ContentTypeResult
-              ignoreContentTypeBadge={ignoreContentTypeBadge}
+              ignoreContentTypeBadge={!!ignoreContentTypeBadge}
               onNavigate={onNavigate}
               contentTypeResult={contentTypeResult}
               resourceToLinkProps={resourceToLinkProps}

package/src/types.ts

@@ -23,9 +23,9 @@ type ResourceTypes = {
 };
 
 export type Resource = {
-  id: string;
+  id: string | number;
   name: string;
-  contentUri: string;
+  contentUri?: string;
   path: string;
   primary?: boolean;
   rank?: number;