@ndla/ui 3.0.8 → 3.0.12

package/lib/index.d.ts

@@ -46,3 +46,4 @@ export { default as ResourceGroup } from './ResourceGroup';
 export { default as LayoutItem, OneColumn, PageContainer, Content } from './Layout';
 export { SubjectAbout, SubjectArchive, SubjectCarousel, SubjectChildContent, SubjectContent, SubjectFilter, SubjectFlexChild, SubjectFlexWrapper, SubjectHeader, SubjectLinks, SubjectNewContent, SubjectSecondaryContent, SubjectSectionTitle, SubjectShortcuts, SubjectSidebarWrapper, SubjectSocialContent, SubjectSocialSection, SubjectTopics, SubjectBanner, } from './Subject';
 export { default as ContentCard } from './ContentCard';
+export { default as MatomoTracker } from './Matomo';

package/lib/index.js

@@ -103,7 +103,8 @@ var _exportNames = {
   SubjectSocialSection: true,
   SubjectTopics: true,
   SubjectBanner: true,
-  ContentCard: true
+  ContentCard: true,
+  MatomoTracker: true
 };
 Object.defineProperty(exports, "ArticleByline", {
   enumerable: true,
@@ -693,6 +694,12 @@ Object.defineProperty(exports, "ContentCard", {
     return _ContentCard["default"];
   }
 });
+Object.defineProperty(exports, "MatomoTracker", {
+  enumerable: true,
+  get: function get() {
+    return _Matomo["default"];
+  }
+});
 
 var _indexJavascript = require("./index-javascript");
 
@@ -781,6 +788,8 @@ var _Subject = require("./Subject");
 
 var _ContentCard = _interopRequireDefault(require("./ContentCard"));
 
+var _Matomo = _interopRequireDefault(require("./Matomo"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }

package/lib/locale/messages-en.d.ts

@@ -17,6 +17,10 @@ declare const messages: {
     user: {
         loggedInAs: string;
         loggedInAsButton: string;
+        role: {
+            employee: string;
+            student: string;
+        };
         buttonLogIn: string;
         buttonLogOut: string;
         generalFooter: string;
@@ -145,6 +149,7 @@ declare const messages: {
             all: string;
             hits: string;
             showingSearchPhrase: string;
+            showingCompetenceGoalSearchPhrase: string;
             searchPhraseSuggestion: string;
             notionLabels: string;
             notionsHeading: string;
@@ -202,6 +207,7 @@ declare const messages: {
     };
     welcomePage: {
         search: string;
+        searchDisclaimer: string;
         resetSearch: string;
         closeSearch: string;
         searchAllInfo: string;
@@ -322,11 +328,8 @@ declare const messages: {
         };
     };
     article: {
-        author: string;
-        published: string;
         edition: string;
         publisher: string;
-        created: string;
         lastUpdated: string;
         closeLabel: string;
         useContent: string;

package/lib/locale/messages-en.js

@@ -134,6 +134,7 @@ var messages = _objectSpread(_objectSpread({
       all: 'All',
       hits: '{{count}} hits',
       showingSearchPhrase: 'Showing results for:',
+      showingCompetenceGoalSearchPhrase: 'Showing results for competence goals {text}',
       searchPhraseSuggestion: 'Search instead for:',
       notionLabels: 'Used in',
       notionsHeading: 'Begrepsforklaring',
@@ -191,6 +192,7 @@ var messages = _objectSpread(_objectSpread({
   },
   welcomePage: {
     search: 'Search',
+    searchDisclaimer: 'We are constantly working to improve ourselves! If you have comments to the search, please use the «spør NDLA» function in the bottom right corner.',
     resetSearch: 'Empty search',
     closeSearch: 'Close search',
     searchAllInfo: 'View all results',
@@ -287,11 +289,8 @@ var messages = _objectSpread(_objectSpread({
     }
   },
   article: {
-    author: 'Author',
-    published: 'Published',
     edition: 'Edition',
     publisher: 'Publisher',
-    created: 'Created',
     lastUpdated: 'Last updated',
     closeLabel: 'Close',
     useContent: 'Cite or use',
@@ -804,6 +803,10 @@ var messages = _objectSpread(_objectSpread({
   user: {
     loggedInAs: 'You are logged in as {{role}}.',
     loggedInAsButton: 'You are logged in as {{role}}',
+    role: {
+      employee: 'Teacher',
+      student: 'Student'
+    },
     buttonLogIn: 'Log in with Feide',
     buttonLogOut: 'Log out',
     generalFooter: 'Some resources may only be accessed by teachers who are logged in.',

package/lib/locale/messages-nb.d.ts

@@ -17,6 +17,10 @@ declare const messages: {
     user: {
         loggedInAs: string;
         loggedInAsButton: string;
+        role: {
+            employee: string;
+            student: string;
+        };
         buttonLogIn: string;
         buttonLogOut: string;
         generalFooter: string;
@@ -676,6 +680,7 @@ declare const messages: {
         createLearningPathButtonText: string;
         lastUpdated: string;
         youAreInALearningPath: string;
+        readTime: string;
         readTimeHour: string;
         readTimeHour_plurals: string;
         readTimeMinutesShort: string;

package/lib/locale/messages-nb.js

@@ -641,6 +641,7 @@ var messages = _objectSpread(_objectSpread({
     createLearningPathButtonText: 'Gå til stier',
     lastUpdated: 'Sist oppdatert',
     youAreInALearningPath: 'Du er nå inne i en læringssti',
+    readTime: '{{hours}} Skoletimer = {{minutes}} min',
     readTimeHour: 'time',
     readTimeHour_plurals: 'timer',
     readTimeMinutesShort: 'min',
@@ -802,6 +803,10 @@ var messages = _objectSpread(_objectSpread({
   user: {
     loggedInAs: 'Du er pålogget som {{role}}.',
     loggedInAsButton: 'Du er pålogget som {{role}}',
+    role: {
+      employee: 'Lærer',
+      student: 'Elev'
+    },
     buttonLogIn: 'Logg inn med Feide',
     buttonLogOut: 'Logg ut',
     generalFooter: 'Enkelte ressurser er bare tilgjengelige for påloggede lærere.',

package/lib/locale/messages-nn.d.ts

@@ -17,6 +17,10 @@ declare const messages: {
     user: {
         loggedInAs: string;
         loggedInAsButton: string;
+        role: {
+            employee: string;
+            student: string;
+        };
         buttonLogIn: string;
         buttonLogOut: string;
         generalFooter: string;
@@ -145,6 +149,7 @@ declare const messages: {
             all: string;
             hits: string;
             showingSearchPhrase: string;
+            showingCompetenceGoalSearchPhrase: string;
             searchPhraseSuggestion: string;
             notionLabels: string;
             notionsHeading: string;

package/lib/locale/messages-nn.js

@@ -134,6 +134,7 @@ var messages = _objectSpread(_objectSpread({
       all: 'Alle',
       hits: '{{count}} Treff',
       showingSearchPhrase: 'Viser resultat for',
+      showingCompetenceGoalSearchPhrase: 'Viser resultat for kompetansemål {text}',
       searchPhraseSuggestion: 'Søk i staden for',
       notionLabels: 'Brukes i',
       notionsHeading: 'Begrepsforklaring',
@@ -802,6 +803,10 @@ var messages = _objectSpread(_objectSpread({
   user: {
     loggedInAs: 'Du er pålogga som {{role}}.',
     loggedInAsButton: 'Du er pålogga som {{role}}',
+    role: {
+      employee: 'Lærer',
+      student: 'Elev'
+    },
     buttonLogIn: 'Logg inn med Feide',
     buttonLogOut: 'Logg ut',
     generalFooter: 'Enkelte ressursar er berre tilgjengelege for pålogga lærarar.',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndla/ui",
-  "version": "3.0.8",
+  "version": "3.0.12",
   "description": "UI component library for NDLA.",
   "license": "GPL-3.0",
   "main": "lib/index.js",
@@ -31,18 +31,18 @@
     "types"
   ],
   "dependencies": {
-    "@ndla/button": "^1.0.5",
-    "@ndla/carousel": "^1.0.5",
+    "@ndla/button": "^1.0.6",
+    "@ndla/carousel": "^1.0.6",
     "@ndla/core": "^0.7.2",
-    "@ndla/hooks": "^1.0.3",
-    "@ndla/icons": "^1.3.0",
-    "@ndla/licenses": "^1.0.6",
-    "@ndla/modal": "^1.1.8",
-    "@ndla/safelink": "^1.0.4",
+    "@ndla/hooks": "^1.0.6",
+    "@ndla/icons": "^1.3.1",
+    "@ndla/licenses": "^1.0.7",
+    "@ndla/modal": "^1.1.11",
+    "@ndla/safelink": "^1.0.5",
     "@ndla/switch": "^0.0.32",
-    "@ndla/tabs": "^1.0.5",
+    "@ndla/tabs": "^1.0.8",
     "@ndla/tooltip": "^0.2.46",
-    "@ndla/util": "^1.0.3",
+    "@ndla/util": "^2.0.0",
     "@reach/menu-button": "^0.12.1",
     "@reach/slider": "^0.12.1",
     "@types/hoist-non-react-statics": "^3.3.1",
@@ -92,5 +92,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d1ecd5ff599a20928025056e7946c4adea3ad685"
+  "gitHead": "358121e2526a252d2b53f010e4b38c17040872dc"
 }

package/src/Article/ArticleByline.tsx

@@ -64,7 +64,7 @@ type Props = {
 };
 
 const ArticleByline = ({
-  authors,
+  authors = [],
   suppliers,
   license,
   licenseBox,
@@ -95,16 +95,17 @@ const ArticleByline = ({
     return contributorsArray.join('');
   };
   const licenseRights = getLicenseByAbbreviation(license, locale).rights;
-
   return (
     <Wrapper>
       <div>
         {t('article.lastUpdated')} {published}
       </div>
-      {authors && (
+      {(authors.length > 0 || licenseRights.length > 0) && (
         <TextWrapper>
           <LicenseByline licenseRights={licenseRights}>
-            <AuthorsWrapper>{t('article.authorsLabel', { names: renderContributors(authors) })}</AuthorsWrapper>
+            {authors.length > 0 && (
+              <AuthorsWrapper>{t('article.authorsLabel', { names: renderContributors(authors) })}</AuthorsWrapper>
+            )}
           </LicenseByline>
         </TextWrapper>
       )}

package/src/Matomo/MatomoTracker.tsx

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2021-present, NDLA.
+ *
+ * This source code is licensed under the GPLv3 license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import React from 'react';
+
+interface Props {
+  trackerUrl: string;
+  siteId: string;
+}
+
+export const MatomoTracker = ({ trackerUrl, siteId }: Props) => {
+  return (
+    <script
+      dangerouslySetInnerHTML={{
+        __html: `
+        var _paq = window._paq = window._paq || [];
+        _paq.push(['trackPageView']);
+        _paq.push(['enableLinkTracking']);
+        (function() {
+            var u="${trackerUrl}";
+            _paq.push(['setTrackerUrl', u+'matomo.php']);
+            _paq.push(['setSiteId', '${siteId}']);
+            var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+            g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+        })();`,
+      }}
+    />
+  );
+};
+
+export default MatomoTracker;

package/src/Matomo/index.ts

@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) 2021-present, NDLA.
+ *
+ * This source code is licensed under the GPLv3 license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import MatomoTracker from './MatomoTracker';
+
+export default MatomoTracker;

package/src/MultidisciplinarySubject/MultidisciplinarySubject.tsx

@@ -1,4 +1,4 @@
-import React, { ReactChildren } from 'react';
+import React, { ReactNode } from 'react';
 import { useTranslation } from 'react-i18next';
 import styled from '@emotion/styled';
 import { breakpoints, fonts, mq } from '@ndla/core';
@@ -87,7 +87,7 @@ const Illustration = styled.div`
 
 type Props = {
   cards: ListItemProps[];
-  children: ReactChildren;
+  children: ReactNode;
   totalCardCount: number;
   hideCards?: boolean;
 };

package/src/index.ts

@@ -135,3 +135,4 @@ export {
 } from './Subject';
 
 export { default as ContentCard } from './ContentCard';
+export { default as MatomoTracker } from './Matomo';

package/src/locale/__tests__/translations-test.ts

@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2021-present, NDLA.
+ *
+ * This source code is licensed under the GPLv3 license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { validateTranslationFiles } from '@ndla/util';
+import messagesNB from '../messages-nb';
+import messagesNN from '../messages-nn';
+import messagesEN from '../messages-en';
+
+test('That all translations has all language keys', () => {
+  const anyMissing = validateTranslationFiles(
+    [
+      {
+        languageName: 'Norsk bokmål',
+        translationObject: messagesNB,
+      },
+      {
+        languageName: 'Norsk nynorsk',
+        translationObject: messagesNN,
+      },
+      {
+        languageName: 'English',
+        translationObject: messagesEN,
+      },
+    ],
+    'only-on-error',
+  );
+
+  expect(anyMissing).toBe(false);
+});

package/src/locale/messages-en.ts

@@ -131,6 +131,7 @@ const messages = {
       all: 'All',
       hits: '{{count}} hits',
       showingSearchPhrase: 'Showing results for:',
+      showingCompetenceGoalSearchPhrase: 'Showing results for competence goals {text}',
       searchPhraseSuggestion: 'Search instead for:',
       notionLabels: 'Used in',
       notionsHeading: 'Begrepsforklaring',
@@ -189,6 +190,8 @@ const messages = {
   },
   welcomePage: {
     search: 'Search',
+    searchDisclaimer:
+      'We are constantly working to improve ourselves! If you have comments to the search, please use the «spør NDLA» function in the bottom right corner.',
     resetSearch: 'Empty search',
     closeSearch: 'Close search',
     searchAllInfo: 'View all results',
@@ -310,11 +313,8 @@ const messages = {
     },
   },
   article: {
-    author: 'Author',
-    published: 'Published',
     edition: 'Edition',
     publisher: 'Publisher',
-    created: 'Created',
     lastUpdated: 'Last updated',
     closeLabel: 'Close',
     useContent: 'Cite or use',
@@ -832,6 +832,10 @@ const messages = {
   user: {
     loggedInAs: 'You are logged in as {{role}}.',
     loggedInAsButton: 'You are logged in as {{role}}',
+    role: {
+      employee: 'Teacher',
+      student: 'Student',
+    },
     buttonLogIn: 'Log in with Feide',
     buttonLogOut: 'Log out',
     generalFooter: 'Some resources may only be accessed by teachers who are logged in.',

package/src/locale/messages-nb.ts

@@ -669,6 +669,7 @@ const messages = {
     createLearningPathButtonText: 'Gå til stier',
     lastUpdated: 'Sist oppdatert',
     youAreInALearningPath: 'Du er nå inne i en læringssti',
+    readTime: '{{hours}} Skoletimer = {{minutes}} min',
     readTimeHour: 'time',
     readTimeHour_plurals: 'timer',
     readTimeMinutesShort: 'min',
@@ -830,6 +831,10 @@ const messages = {
   user: {
     loggedInAs: 'Du er pålogget som {{role}}.',
     loggedInAsButton: 'Du er pålogget som {{role}}',
+    role: {
+      employee: 'Lærer',
+      student: 'Elev',
+    },
     buttonLogIn: 'Logg inn med Feide',
     buttonLogOut: 'Logg ut',
     generalFooter: 'Enkelte ressurser er bare tilgjengelige for påloggede lærere.',

package/src/locale/messages-nn.ts

@@ -131,6 +131,7 @@ const messages = {
       all: 'Alle',
       hits: '{{count}} Treff',
       showingSearchPhrase: 'Viser resultat for',
+      showingCompetenceGoalSearchPhrase: 'Viser resultat for kompetansemål {text}',
       searchPhraseSuggestion: 'Søk i staden for',
       notionLabels: 'Brukes i',
       notionsHeading: 'Begrepsforklaring',
@@ -831,6 +832,10 @@ const messages = {
   user: {
     loggedInAs: 'Du er pålogga som {{role}}.',
     loggedInAsButton: 'Du er pålogga som {{role}}',
+    role: {
+      employee: 'Lærer',
+      student: 'Elev',
+    },
     buttonLogIn: 'Logg inn med Feide',
     buttonLogOut: 'Logg ut',
     generalFooter: 'Enkelte ressursar er berre tilgjengelege for pålogga lærarar.',