@ndla/ui 44.0.10 → 44.0.12

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

@@ -151,6 +151,7 @@ declare const messages: {
         detailView: string;
         shortView: string;
         sharedFolder: {
+            folderCopied: string;
             info: string;
             firstShared: string;
             learningpathUnsupported: string;

package/lib/locale/messages-en.js

@@ -1154,6 +1154,7 @@ var messages = _objectSpread(_objectSpread({
     detailView: 'Detailed listview',
     shortView: 'Card view',
     sharedFolder: {
+      folderCopied: 'The folder was copied.',
       info: 'This folder contains learning resources and tasks from NDLA, gathered by a teacher.',
       firstShared: 'The folder was shared for the first time {{date}}',
       learningpathUnsupported: 'Learning paths and multidisciplinary cases cannot be shown directly in a shared folder. You can open the learning path in a new tab by clicking the link in the navigation menu to the left.',

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

@@ -151,6 +151,7 @@ declare const messages: {
         detailView: string;
         shortView: string;
         sharedFolder: {
+            folderCopied: string;
             info: string;
             firstShared: string;
             learningpathUnsupported: string;

package/lib/locale/messages-nb.js

@@ -1152,6 +1152,7 @@ var messages = _objectSpread(_objectSpread({
     detailView: 'Detaljert listevisning',
     shortView: 'Kort visning',
     sharedFolder: {
+      folderCopied: 'Mappen har blitt kopiert.',
       info: 'Denne mappa inneholder fagstoff og oppgaver fra NDLA, samlet av en lærer. ',
       firstShared: 'Mappa ble delt første gang {{date}}',
       learningpathUnsupported: 'Læringsstier og tverrfaglige caser kan ikke vises direkte i delte mapper. Dersom du trykker på lenka i navigasjonsmenyen til venstre, vil stien åpnes i en ny fane.',

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

@@ -151,6 +151,7 @@ declare const messages: {
         detailView: string;
         shortView: string;
         sharedFolder: {
+            folderCopied: string;
             info: string;
             firstShared: string;
             drawerButton: string;

package/lib/locale/messages-nn.js

@@ -1152,6 +1152,7 @@ var messages = _objectSpread(_objectSpread({
     detailView: 'Detaljert listevisning',
     shortView: 'Kortvisning',
     sharedFolder: {
+      folderCopied: 'Mappa vart kopiert.',
       info: 'Denne mappa inneheld fagstoff og oppgåver frå NDLA, samla av ein lærar.',
       firstShared: 'Mappa vart delt første gong {{date}}',
       drawerButton: 'Vis mapper og ressursar',

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

@@ -151,6 +151,7 @@ declare const messages: {
         detailView: string;
         shortView: string;
         sharedFolder: {
+            folderCopied: string;
             info: string;
             firstShared: string;
             drawerButton: string;

package/lib/locale/messages-se.js

@@ -1152,6 +1152,7 @@ var messages = _objectSpread(_objectSpread({
     detailView: 'Bienalaš oppalašlistu',
     shortView: 'Oanehis listu',
     sharedFolder: {
+      folderCopied: 'Mappen har blitt kopiert.',
       info: 'Dán máhpas lea NDLA fágasisdoallu ja bargobihtát, čohkkejuvvon oahpaheaddjis.',
       firstShared: 'Máhppa juogaduvvui vuosttaš geardde {{date}}',
       drawerButton: 'Čájet máhpaid ja resurssaid',

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

@@ -151,6 +151,7 @@ declare const messages: {
         detailView: string;
         shortView: string;
         sharedFolder: {
+            folderCopied: string;
             info: string;
             firstShared: string;
             drawerButton: string;

package/lib/locale/messages-sma.js

@@ -1152,6 +1152,7 @@ var messages = _objectSpread(_objectSpread({
     detailView: 'Detaljert listevisning',
     shortView: 'Kort visning',
     sharedFolder: {
+      folderCopied: 'Mappen har blitt kopiert.',
       info: 'Denne mappa inneheld fagstoff og oppgåver frå NDLA, samla av ein lærar.',
       firstShared: 'Mappa vart delt første gong {{date}}',
       drawerButton: 'Vis mapper og ressursar',

package/lib/types.d.ts

@@ -59,7 +59,7 @@ export interface Article {
     introduction: string;
     content: ReactNode;
     footNotes: Array<FootNote>;
-    copyright: Copyright;
+    copyright?: Copyright;
     published: string;
 }
 export type SearchResult = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndla/ui",
-  "version": "44.0.10",
+  "version": "44.0.12",
   "description": "UI component library for NDLA.",
   "license": "GPL-3.0",
   "main": "lib/index.js",
@@ -31,23 +31,23 @@
     "types"
   ],
   "dependencies": {
-    "@ndla/accordion": "^2.2.18",
+    "@ndla/accordion": "^2.2.19",
     "@ndla/article-scripts": "^3.0.20",
-    "@ndla/button": "^11.0.3",
-    "@ndla/carousel": "^3.1.13",
-    "@ndla/core": "^4.1.4",
-    "@ndla/dropdown-menu": "^1.0.2",
-    "@ndla/forms": "^4.3.18",
+    "@ndla/button": "^11.0.4",
+    "@ndla/carousel": "^3.1.14",
+    "@ndla/core": "^4.1.5",
+    "@ndla/dropdown-menu": "^1.0.3",
+    "@ndla/forms": "^4.3.19",
     "@ndla/hooks": "^2.0.9",
-    "@ndla/icons": "^4.0.3",
+    "@ndla/icons": "^4.0.4",
     "@ndla/licenses": "^7.1.3",
-    "@ndla/modal": "^4.0.2",
-    "@ndla/notion": "^5.0.17",
-    "@ndla/safelink": "^4.1.17",
-    "@ndla/select": "^2.4.9",
-    "@ndla/switch": "^1.1.9",
-    "@ndla/tabs": "^3.0.5",
-    "@ndla/tooltip": "^4.1.15",
+    "@ndla/modal": "^4.0.3",
+    "@ndla/notion": "^5.0.18",
+    "@ndla/safelink": "^4.1.18",
+    "@ndla/select": "^2.4.10",
+    "@ndla/switch": "^1.1.10",
+    "@ndla/tabs": "^3.0.6",
+    "@ndla/tooltip": "^4.1.16",
     "@ndla/util": "^3.1.15",
     "@radix-ui/react-popover": "^1.0.6",
     "@radix-ui/react-slider": "^1.1.2",
@@ -83,5 +83,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d52fa3d77a3b81f0ac5e5b0d6e8a59c1018bc82f"
+  "gitHead": "34623f3f23a922343d9de9746ea901cf1e2065ce"
 }

package/src/Article/Article.tsx

@@ -184,16 +184,10 @@ export const Article = ({
     }
   }, [wrapperRef]);
 
-  const {
-    title,
-    introduction,
-    published,
-    content,
-    footNotes,
-    copyright: { license: licenseObj, creators, rightsholders, processors },
-  } = article;
+  const { title, introduction, published, content, footNotes, copyright } = article;
 
-  const authors = creators.length || rightsholders.length ? creators : processors;
+  const authors =
+    copyright?.creators.length || copyright?.rightsholders.length ? copyright.creators : copyright?.processors;
 
   return (
     <div ref={wrapperRef}>
@@ -226,9 +220,9 @@ export const Article = ({
           <ArticleByline
             footnotes={footNotes}
             authors={authors}
-            suppliers={rightsholders}
+            suppliers={copyright?.rightsholders}
             published={published}
-            license={licenseObj?.license ?? ''}
+            license={copyright?.license?.license ?? ''}
             licenseBox={licenseBox}
           />
         </LayoutItem>

package/src/Article/ArticleByline.tsx

@@ -139,7 +139,6 @@ const ArticleByline = ({
   const license = getLicenseByAbbreviation(licenseString, locale);
 
   const showPrimaryContributors = suppliers.length > 0 || authors.length > 0;
-  const showSecondaryContributors = suppliers.length > 0 && authors.length > 0;
 
   return (
     <Wrapper>
@@ -148,12 +147,12 @@ const ArticleByline = ({
           <LicenseLink license={license} />
           {showPrimaryContributors && (
             <PrimaryContributorsWrapper>
-              {authors.length > 0
-                ? t('article.authorsLabel', {
-                    names: renderContributors(authors, t),
-                    interpolation: { escapeValue: false },
-                  })
-                : getSuppliersText(suppliers, t)}
+              {authors.length > 0 &&
+                `${t('article.authorsLabel', {
+                  names: renderContributors(authors, t),
+                  interpolation: { escapeValue: false },
+                })}. `}
+              {getSuppliersText(suppliers, t)}
             </PrimaryContributorsWrapper>
           )}
         </LicenseWrapper>
@@ -161,7 +160,6 @@ const ArticleByline = ({
           {t('article.lastUpdated')} {published}
         </div>
       </TextWrapper>
-      {showSecondaryContributors && <TextWrapper>{getSuppliersText(suppliers, t)}</TextWrapper>}
       <AccordionRoot type="multiple" onValueChange={setOpenAccordions} value={openAccordions}>
         {licenseBox && (
           <AccordionItem value="rulesForUse">

package/src/BannerCard/BannerCard.tsx

@@ -58,7 +58,7 @@ const ContentText = styled.p`
 `;
 const LinkText = styled(SafeLink)`
   font-size: ${fonts.sizes(16)};
-  color: ${colors.brand.grey};
+  color: ${colors.brand.primary};
 `;
 const TitleText = styled.h2`
   margin-top: 7px;

package/src/FrontpageArticle/FrontpageArticle.tsx

@@ -78,9 +78,9 @@ export const FrontpageArticle = ({ article, id, isWide, licenseBox }: Props) =>
   }
 
   const authors =
-    article.copyright.creators.length || article.copyright.rightsholders.length
+    article.copyright?.creators.length || article.copyright?.rightsholders.length
       ? article.copyright.creators
-      : article.copyright.processors;
+      : article.copyright?.processors;
   return (
     <StyledArticle style={cssVars}>
       <LayoutItem>
@@ -92,8 +92,8 @@ export const FrontpageArticle = ({ article, id, isWide, licenseBox }: Props) =>
       <LayoutItem>{content}</LayoutItem>
       <ArticleByline
         authors={authors}
-        suppliers={article.copyright.rightsholders}
-        license={article.copyright.license?.license!}
+        suppliers={article.copyright?.rightsholders}
+        license={article.copyright?.license?.license!}
         published={article.published}
         accordionHeaderVariant={'white'}
         licenseBox={licenseBox}

package/src/Table/component.tables.scss

@@ -150,6 +150,11 @@ article table {
       @include font-size(15px, 30px);
     }
 
+    ol,
+    ul {
+      font-size: unset !important;
+    }
+
     p {
       line-height: 1.6em;
     }

package/src/locale/messages-en.ts

@@ -1197,6 +1197,7 @@ const messages = {
     detailView: 'Detailed listview',
     shortView: 'Card view',
     sharedFolder: {
+      folderCopied: 'The folder was copied.',
       info: 'This folder contains learning resources and tasks from NDLA, gathered by a teacher.',
       firstShared: 'The folder was shared for the first time {{date}}',
       learningpathUnsupported:

package/src/locale/messages-nb.ts

@@ -1194,6 +1194,7 @@ const messages = {
     detailView: 'Detaljert listevisning',
     shortView: 'Kort visning',
     sharedFolder: {
+      folderCopied: 'Mappen har blitt kopiert.',
       info: 'Denne mappa inneholder fagstoff og oppgaver fra NDLA, samlet av en lærer. ',
       firstShared: 'Mappa ble delt første gang {{date}}',
       learningpathUnsupported:

package/src/locale/messages-nn.ts

@@ -1194,6 +1194,7 @@ const messages = {
     detailView: 'Detaljert listevisning',
     shortView: 'Kortvisning',
     sharedFolder: {
+      folderCopied: 'Mappa vart kopiert.',
       info: 'Denne mappa inneheld fagstoff og oppgåver frå NDLA, samla av ein lærar.',
       firstShared: 'Mappa vart delt første gong {{date}}',
       drawerButton: 'Vis mapper og ressursar',

package/src/locale/messages-se.ts

@@ -1195,6 +1195,7 @@ const messages = {
     detailView: 'Bienalaš oppalašlistu',
     shortView: 'Oanehis listu',
     sharedFolder: {
+      folderCopied: 'Mappen har blitt kopiert.',
       info: 'Dán máhpas lea NDLA fágasisdoallu ja bargobihtát, čohkkejuvvon oahpaheaddjis.',
       firstShared: 'Máhppa juogaduvvui vuosttaš geardde {{date}}',
       drawerButton: 'Čájet máhpaid ja resurssaid',

package/src/locale/messages-sma.ts

@@ -1199,6 +1199,7 @@ const messages = {
     detailView: 'Detaljert listevisning',
     shortView: 'Kort visning',
     sharedFolder: {
+      folderCopied: 'Mappen har blitt kopiert.',
       info: 'Denne mappa inneheld fagstoff og oppgåver frå NDLA, samla av ein lærar.',
       firstShared: 'Mappa vart delt første gong {{date}}',
       drawerButton: 'Vis mapper og ressursar',

package/src/types.ts

@@ -70,7 +70,7 @@ export interface Article {
   introduction: string;
   content: ReactNode;
   footNotes: Array<FootNote>;
-  copyright: Copyright;
+  copyright?: Copyright;
   published: string;
 }