@ndla/ui 30.8.0 → 30.8.2

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

@@ -106,6 +106,7 @@ declare const messages: {
         alreadyFavourited: string;
         alreadyInFolder: string;
         noFolderSelected: string;
+        examLockInfo: string;
         help: string;
         more: string;
         listView: string;

package/lib/locale/messages-en.js

@@ -1044,6 +1044,7 @@ var messages = _objectSpread(_objectSpread({
     alreadyFavourited: 'Already in my favourites',
     alreadyInFolder: 'Already in folder. You can still save new tags.',
     noFolderSelected: 'Select or create a new folder to save the resource.',
+    examLockInfo: 'Editing content on Min NDLA is deactivated for pupils during the exam period.',
     help: 'Help',
     more: 'More options',
     listView: 'List view',

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

@@ -106,6 +106,7 @@ declare const messages: {
         alreadyFavourited: string;
         alreadyInFolder: string;
         noFolderSelected: string;
+        examLockInfo: string;
         help: string;
         more: string;
         listView: string;

package/lib/locale/messages-nb.js

@@ -1044,6 +1044,7 @@ var messages = _objectSpread(_objectSpread({
     alreadyFavourited: 'Allerede lagt til i mine favoritter',
     alreadyInFolder: 'Finnes allerede i mappen. Du kan fortsatt lagre nye emneknagger.',
     noFolderSelected: 'Velg eller opprett ny mappe for å lagre ressursen',
+    examLockInfo: 'Redigering av innhold på Min NDLA er deaktivert for elever i eksamensperioden.',
     help: 'Hjelp',
     more: 'Flere valg',
     listView: 'Listevisning',

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

@@ -106,6 +106,7 @@ declare const messages: {
         alreadyFavourited: string;
         alreadyInFolder: string;
         noFolderSelected: string;
+        examLockInfo: string;
         help: string;
         more: string;
         listView: string;

package/lib/locale/messages-nn.js

@@ -1044,6 +1044,7 @@ var messages = _objectSpread(_objectSpread({
     alreadyFavourited: 'Allereie lagt til i mine favorittar',
     alreadyInFolder: 'Finst allereie i mappa. Du kan fortsatt lagre nye emneknaggar.',
     noFolderSelected: 'Velg eller opprett ny mappe for å lagre ressursen',
+    examLockInfo: 'Redigering av innhald på Min NDLA er deaktivert for elevar i eksamensperioden.',
     help: 'Hjelp',
     more: 'Fleire val',
     listView: 'Listevisning',

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

@@ -106,6 +106,7 @@ declare const messages: {
         alreadyFavourited: string;
         alreadyInFolder: string;
         noFolderSelected: string;
+        examLockInfo: string;
         help: string;
         more: string;
         listView: string;

package/lib/locale/messages-se.js

@@ -1044,6 +1044,7 @@ var messages = _objectSpread(_objectSpread({
     alreadyFavourited: 'Lea juo biddjon oiddohin',
     alreadyInFolder: 'Gávdno juo máhpas. Sáhtát ain vurket ođđa fáddágilkoriid.',
     noFolderSelected: 'Vállje dahje ráhkat ođđa máhpa vai seasttát resurssa',
+    examLockInfo: 'Mu NDLA sisdoalu redigeren ii leat doaimmas ohppiide eksámenáigodagas.',
     help: 'Veahkki',
     more: 'Eanet válljejumit',
     listView: 'Oppalašlistu',

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

@@ -106,6 +106,7 @@ declare const messages: {
         alreadyFavourited: string;
         alreadyInFolder: string;
         noFolderSelected: string;
+        examLockInfo: string;
         help: string;
         more: string;
         listView: string;

package/lib/locale/messages-sma.js

@@ -1044,6 +1044,7 @@ var messages = _objectSpread(_objectSpread({
     alreadyFavourited: 'Allerede lagt til i mine favoritter',
     alreadyInFolder: 'Finnes allerede i mappen. Du kan fortsatt lagre nye emneknagger.',
     noFolderSelected: 'Velg eller opprett ny mappe for å lagre ressursen',
+    examLockInfo: 'Redigering av innhold på Min NDLA er deaktivert for elever i eksamensperioden.',
     help: 'Hjelp',
     more: 'Flere valg',
     listView: 'Listevisning',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndla/ui",
-  "version": "30.8.0",
+  "version": "30.8.2",
   "description": "UI component library for NDLA.",
   "license": "GPL-3.0",
   "main": "lib/index.js",
@@ -9,7 +9,7 @@
   "sideEffects": false,
   "scripts": {
     "build": "yarn build:css && yarn build:types",
-    "build:css": "webpack -p && cp ./dist/*.css ./es && cp ./dist/*.css ./lib",
+    "build:css": "webpack && cp ./dist/*.css ./es && cp ./dist/*.css ./lib",
     "build:types": "tsc -p tsconfig.build.json",
     "prepublish": "yarn build"
   },
@@ -32,20 +32,20 @@
   ],
   "dependencies": {
     "@ndla/article-scripts": "^3.0.9",
-    "@ndla/button": "^6.0.0",
-    "@ndla/carousel": "^2.0.6",
-    "@ndla/core": "^3.0.1",
-    "@ndla/forms": "^4.0.12",
+    "@ndla/button": "^6.0.2",
+    "@ndla/carousel": "^2.0.7",
+    "@ndla/core": "^3.0.2",
+    "@ndla/forms": "^4.0.14",
     "@ndla/hooks": "^1.1.13",
-    "@ndla/icons": "^2.0.6",
-    "@ndla/licenses": "^6.0.7",
-    "@ndla/modal": "^2.1.1",
-    "@ndla/notion": "^4.0.14",
-    "@ndla/safelink": "^3.0.12",
-    "@ndla/switch": "^1.0.1",
-    "@ndla/tabs": "^2.0.8",
-    "@ndla/tooltip": "^3.0.3",
-    "@ndla/types-learningpath-api": "^0.0.13",
+    "@ndla/icons": "^2.0.7",
+    "@ndla/licenses": "^6.0.9",
+    "@ndla/modal": "^2.1.2",
+    "@ndla/notion": "^4.0.16",
+    "@ndla/safelink": "^3.0.14",
+    "@ndla/switch": "^1.0.2",
+    "@ndla/tabs": "^2.0.9",
+    "@ndla/tooltip": "^3.0.5",
+    "@ndla/types-learningpath-api": "^0.0.17",
     "@ndla/util": "^3.1.7",
     "@reach/menu-button": "^0.16.2",
     "@reach/slider": "^0.16.0",
@@ -81,10 +81,10 @@
     "mini-css-extract-plugin": "^0.5.0",
     "sass-loader": "^7.1.0",
     "webpack": "^4.44.1",
-    "webpack-cli": "^3.3.12"
+    "webpack-cli": "^4.10.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d915f0ffc2983d60515a14ee674f88d74e401a8b"
+  "gitHead": "87a608977cc0558fcf41dcf7c9f6e6414d7c7c02"
 }

package/src/MyNdla/Resource/Folder.tsx

@@ -99,15 +99,18 @@ const FolderTitle = styled.h2`
   }
 `;
 
-const MenuWrapper = styled.div`
+interface MenuWrapperProps {
+  hasMenuButton: boolean;
+}
+
+const MenuWrapper = styled.div<MenuWrapperProps>`
   overflow: hidden;
   display: flex;
   flex-direction: row;
   align-items: center;
   gap: ${spacing.xsmall};
   justify-content: space-between;
-  margin: -${spacing.nsmall};
-  margin-left: 0;
+  margin: -${spacing.nsmall} -${(props) => (props.hasMenuButton ? spacing.nsmall : 0)} -${spacing.nsmall} 0;
 `;
 
 const CountContainer = styled.div`
@@ -185,7 +188,7 @@ const Folder = ({ id, link, title, subFolders, subResources, type = 'list', menu
           <FolderTitle title={title}>{title}</FolderTitle>
         </StyledLink>
       </TitleWrapper>
-      <MenuWrapper>
+      <MenuWrapper hasMenuButton={!!menuItems?.length}>
         <CountContainer>
           <Count layoutType={type} type={'folder'} count={subFolders} />
           <Count layoutType={type} type={'resource'} count={subResources} />

package/src/Resource/resourceComponents.tsx

@@ -55,6 +55,7 @@ const StyledTagListElement = styled.li`
 
 const StyledSafeLink = styled(SafeLink)`
   display: flex;
+  justify-content: flex-end;
   align-items: center;
   box-shadow: none;
   color: ${colors.brand.grey};

package/src/locale/messages-en.ts

@@ -1093,6 +1093,7 @@ const messages = {
     alreadyFavourited: 'Already in my favourites',
     alreadyInFolder: 'Already in folder. You can still save new tags.',
     noFolderSelected: 'Select or create a new folder to save the resource.',
+    examLockInfo: 'Editing content on Min NDLA is deactivated for pupils during the exam period.',
     help: 'Help',
     more: 'More options',
     listView: 'List view',

package/src/locale/messages-nb.ts

@@ -1091,6 +1091,7 @@ const messages = {
     alreadyFavourited: 'Allerede lagt til i mine favoritter',
     alreadyInFolder: 'Finnes allerede i mappen. Du kan fortsatt lagre nye emneknagger.',
     noFolderSelected: 'Velg eller opprett ny mappe for å lagre ressursen',
+    examLockInfo: 'Redigering av innhold på Min NDLA er deaktivert for elever i eksamensperioden.',
     help: 'Hjelp',
     more: 'Flere valg',
     listView: 'Listevisning',

package/src/locale/messages-nn.ts

@@ -1092,6 +1092,7 @@ const messages = {
     alreadyFavourited: 'Allereie lagt til i mine favorittar',
     alreadyInFolder: 'Finst allereie i mappa. Du kan fortsatt lagre nye emneknaggar.',
     noFolderSelected: 'Velg eller opprett ny mappe for å lagre ressursen',
+    examLockInfo: 'Redigering av innhald på Min NDLA er deaktivert for elevar i eksamensperioden.',
     help: 'Hjelp',
     more: 'Fleire val',
     listView: 'Listevisning',

package/src/locale/messages-se.ts

@@ -1092,6 +1092,7 @@ const messages = {
     alreadyFavourited: 'Lea juo biddjon oiddohin',
     alreadyInFolder: 'Gávdno juo máhpas. Sáhtát ain vurket ođđa fáddágilkoriid.',
     noFolderSelected: 'Vállje dahje ráhkat ođđa máhpa vai seasttát resurssa',
+    examLockInfo: 'Mu NDLA sisdoalu redigeren ii leat doaimmas ohppiide eksámenáigodagas.',
     help: 'Veahkki',
     more: 'Eanet válljejumit',
     listView: 'Oppalašlistu',

package/src/locale/messages-sma.ts

@@ -1093,6 +1093,7 @@ const messages = {
     alreadyFavourited: 'Allerede lagt til i mine favoritter',
     alreadyInFolder: 'Finnes allerede i mappen. Du kan fortsatt lagre nye emneknagger.',
     noFolderSelected: 'Velg eller opprett ny mappe for å lagre ressursen',
+    examLockInfo: 'Redigering av innhold på Min NDLA er deaktivert for elever i eksamensperioden.',
     help: 'Hjelp',
     more: 'Flere valg',
     listView: 'Listevisning',