@ndla/ui 19.0.0 → 19.1.1

package/lib/locale/messages-sma.js

@@ -951,7 +951,13 @@ var messages = _objectSpread(_objectSpread({
     resources_plural: '{{count}} ressurser',
     folders: '{{count}} mappe',
     folders_plural: '{{count}} mapper',
-    folder: 'Mappe',
+    folder: {
+      folder: 'Mappe',
+      "delete": 'Slett',
+      edit: 'Rediger'
+    },
+    confirmDeleteFolder: 'Er du sikker på at du vil slette mappen? Denne handlingen kan ikke angres.',
+    confirmDeleteTag: 'Er du sikker på at du vil slette tag? Denne handlingen kan ikke angres.',
     myFolders: 'Mine mapper',
     myTags: 'Mine tags',
     newFolder: 'Ny mappe',
@@ -997,6 +1003,9 @@ var messages = _objectSpread(_objectSpread({
       }
     },
     resource: {
+      add: 'Legg til mappe/tag',
+      remove: 'Fjern',
+      copyLink: 'Kopier lenke til siden',
       addToMyNdla: 'Legg i Min NDLA',
       addedToMyNdla: 'Lagt i Min NDLA'
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndla/ui",
-  "version": "19.0.0",
+  "version": "19.1.1",
   "description": "UI component library for NDLA.",
   "license": "GPL-3.0",
   "main": "lib/index.js",
@@ -31,15 +31,15 @@
     "types"
   ],
   "dependencies": {
-    "@ndla/button": "^3.0.0",
+    "@ndla/button": "^3.1.1",
     "@ndla/carousel": "^1.2.11",
     "@ndla/core": "^2.3.0",
     "@ndla/hooks": "^1.1.4",
     "@ndla/icons": "^1.10.0",
     "@ndla/licenses": "^5.0.2",
     "@ndla/modal": "^1.2.12",
-    "@ndla/notion": "^3.1.18",
-    "@ndla/safelink": "^2.0.9",
+    "@ndla/notion": "^3.1.21",
+    "@ndla/safelink": "^2.1.2",
     "@ndla/switch": "^0.1.7",
     "@ndla/tabs": "^1.1.10",
     "@ndla/tooltip": "^2.1.2",
@@ -81,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ae09299c27fc3f48f1b8f77ebe37c7aac511b2ad"
+  "gitHead": "38b047f42fcb12c9b44d18246479c51f22d8bf63"
 }

package/src/Breadcrumb/ActionBreadcrumb.tsx

@@ -44,6 +44,9 @@ interface Props {
 
 const ActionBreadcrumb = ({ items, actionItems }: Props) => {
   const renderItem = (item: IndexedBreadcrumbItem, totalCount: number) => {
+    if (totalCount === 1) {
+      return <StyledSpan title={item.name}>{item.name}</StyledSpan>;
+    }
     if (item.index === totalCount - 1) {
       return (
         <MenuButton menuItems={actionItems} size="small">

package/src/MyNdla/Resource/Folder.tsx

@@ -136,7 +136,7 @@ const Folder = ({ link, title, subFolders, subResources, type = 'list', menuItem
   return (
     <FolderWrapper to={link}>
       <FolderIconWrapper type={type}>
-        <FolderOutlined aria-label={t('myNdla.folder')} />
+        <FolderOutlined aria-label={t('myNdla.folder.folder')} />
       </FolderIconWrapper>
       <FolderTitle>{title}</FolderTitle>
       <IconCount layoutType={type} type={'folder'} count={subFolders} />

package/src/Resource/ListResource.tsx

@@ -31,12 +31,13 @@ const ResourceDescription = styled.p`
 `;
 
 const ResourceWrapper = styled(SafeLink)`
-  display: grid;
   flex: 1;
+  display: grid;
+  grid-template-columns: auto 1fr auto;
   grid-template-areas:
     'image  topicAndTitle   tags'
     'image  description     description';
-  grid-template-columns: auto 1fr auto;
+
   ${mq.range({ until: breakpoints.mobileWide })} {
     grid-template-columns: auto 1fr;
     grid-template-areas:
@@ -52,6 +53,7 @@ const ResourceWrapper = styled(SafeLink)`
   border-radius: 2px;
   color: ${colors.brand.greyDark};
   gap: 0 ${spacing.small};
+
   &:hover {
     box-shadow: 1px 1px 6px 2px rgba(9, 55, 101, 0.08);
     transition-duration: 0.2s;

package/src/TreeStructure/FolderItem.tsx

@@ -11,6 +11,7 @@ import styled from '@emotion/styled';
 import { ArrowDropDown } from '@ndla/icons/common';
 import { FolderOutlined } from '@ndla/icons/contentType';
 import { colors, spacing, misc, animations } from '@ndla/core';
+import SafeLink from '@ndla/safelink';
 import { SetFocusedFolderId, FolderChildFuncType } from './TreeStructure.types';
 
 const OpenButton = styled.button<{ isOpen: boolean }>`
@@ -75,7 +76,7 @@ const FolderName = styled.button<{ marked: boolean; noArrow?: boolean }>`
   text-align: left;
 `;
 
-const FolderNameLink = FolderName.withComponent('a');
+const FolderNameLink = FolderName.withComponent(SafeLink);
 
 interface Props {
   name: string;
@@ -135,9 +136,9 @@ const FolderItem = ({
         <FolderNameLink
           ref={folderNameLinkRef}
           noArrow={hideArrow}
+          to={loading ? '' : url}
           tabIndex={marked ? 0 : -1}
           marked={marked}
-          href={loading ? undefined : url}
           onFocus={() => {
             setFocusedFolderId(id);
           }}

package/src/locale/messages-en.ts

@@ -989,7 +989,13 @@ const messages = {
     resources_plural: '{{count}} Resources',
     folders: '{{count}} Folder',
     folders_plural: '{{count}} Folders',
-    folder: 'Folder',
+    folder: {
+      folder: 'Folder',
+      delete: 'Delete',
+      edit: 'Edit',
+    },
+    confirmDeleteFolder: 'Are you sure you want to delete this folder? This process cannot be undone.',
+    confirmDeleteTag: 'Are you sure you want to delete this tag? This process cannot be undone.',
     myFolders: 'My folders',
     myTags: 'My tags',
     newFolder: 'New folder',
@@ -1031,6 +1037,9 @@ const messages = {
       },
     },
     resource: {
+      add: 'Add folder/tag',
+      remove: 'Remove',
+      copyLink: 'Copy link to this page',
       addToMyNdla: 'Add to My NDLA',
       addedToMyNdla: 'Added to My NDLA',
     },

package/src/locale/messages-nb.ts

@@ -987,7 +987,13 @@ const messages = {
     resources_plural: '{{count}} ressurser',
     folders: '{{count}} mappe',
     folders_plural: '{{count}} mapper',
-    folder: 'Mappe',
+    folder: {
+      folder: 'Mappe',
+      delete: 'Slett',
+      edit: 'Rediger',
+    },
+    confirmDeleteFolder: 'Er du sikker på at du vil slette mappen? Denne handlingen kan ikke angres.',
+    confirmDeleteTag: 'Er du sikker på at du vil slette tag? Denne handlingen kan ikke angres.',
     myFolders: 'Mine mapper',
     myTags: 'Mine tags',
     newFolder: 'Ny mappe',
@@ -1028,6 +1034,9 @@ const messages = {
       },
     },
     resource: {
+      add: 'Legg til mappe/tag',
+      remove: 'Fjern',
+      copyLink: 'Kopier lenke til siden',
       addToMyNdla: 'Legg i Min NDLA',
       addedToMyNdla: 'Lagt i Min NDLA',
     },

package/src/locale/messages-nn.ts

@@ -988,7 +988,13 @@ const messages = {
     resources_plural: '{{count}} ressursar',
     folders: '{{count}} mappe',
     folders_plural: '{{count}} mapper',
-    folder: 'Mappe',
+    folder: {
+      folder: 'Mappe',
+      delete: 'Slett',
+      edit: 'Rediger',
+    },
+    confirmDeleteFolder: 'Er du sikker på at du vil slette mappa? Denne handlinga kan ikkje angres.',
+    confirmDeleteTag: 'Er du sikker på at du vil slette tag? Denne handlinga kan ikkje angres.',
     myFolders: 'Mine mapper',
     myTags: 'Mine tags',
     newFolder: 'Ny mappe',
@@ -1029,6 +1035,9 @@ const messages = {
       },
     },
     resource: {
+      add: 'Legg til mappe/tag',
+      remove: 'Fjern',
+      copyLink: 'Kopier lenke til sida',
       addToMyNdla: 'Legg i Min NDLA',
       addedToMyNdla: 'Lagt i Min NDLA',
     },

package/src/locale/messages-se.ts

@@ -987,7 +987,13 @@ const messages = {
     resources_plural: '{{count}} ressurser',
     folders: '{{count}} mappe',
     folders_plural: '{{count}} mapper',
-    folder: 'Mappe',
+    folder: {
+      folder: 'Mappe',
+      delete: 'Slett',
+      edit: 'Rediger',
+    },
+    confirmDeleteFolder: 'Er du sikker på at du vil slette mappen? Denne handlingen kan ikke angres.',
+    confirmDeleteTag: 'Er du sikker på at du vil slette tag? Denne handlingen kan ikke angres.',
     myFolders: 'Mine mapper',
     myTags: 'Mine tags',
     newFolder: 'Ny mappe',
@@ -1028,6 +1034,9 @@ const messages = {
       },
     },
     resource: {
+      add: 'Legg til mappe/tag',
+      remove: 'Fjern',
+      copyLink: 'Kopier lenke til siden',
       addToMyNdla: 'Legg i Min NDLA',
       addedToMyNdla: 'Lagt i Min NDLA',
     },

package/src/locale/messages-sma.ts

@@ -987,7 +987,13 @@ const messages = {
     resources_plural: '{{count}} ressurser',
     folders: '{{count}} mappe',
     folders_plural: '{{count}} mapper',
-    folder: 'Mappe',
+    folder: {
+      folder: 'Mappe',
+      delete: 'Slett',
+      edit: 'Rediger',
+    },
+    confirmDeleteFolder: 'Er du sikker på at du vil slette mappen? Denne handlingen kan ikke angres.',
+    confirmDeleteTag: 'Er du sikker på at du vil slette tag? Denne handlingen kan ikke angres.',
     myFolders: 'Mine mapper',
     myTags: 'Mine tags',
     newFolder: 'Ny mappe',
@@ -1028,6 +1034,9 @@ const messages = {
       },
     },
     resource: {
+      add: 'Legg til mappe/tag',
+      remove: 'Fjern',
+      copyLink: 'Kopier lenke til siden',
       addToMyNdla: 'Legg i Min NDLA',
       addedToMyNdla: 'Lagt i Min NDLA',
     },