@ndla/ui 50.8.0 → 50.8.2

package/src/model/ContentType.ts

@@ -6,15 +6,15 @@
  *
  */
 
-export const SUBJECT_MATERIAL = 'subject-material';
-export const TASKS_AND_ACTIVITIES = 'tasks-and-activities';
-export const ASSESSMENT_RESOURCES = 'assessment-resources';
-export const SUBJECT = 'subject';
-export const EXTERNAL_LEARNING_RESOURCES = 'external-learning-resources';
-export const SOURCE_MATERIAL = 'source-material';
-export const LEARNING_PATH = 'learning-path';
-export const TOPIC = 'topic';
-export const MULTIDISCIPLINARY_TOPIC = 'multidisciplinary-topic';
+export const SUBJECT_MATERIAL = "subject-material";
+export const TASKS_AND_ACTIVITIES = "tasks-and-activities";
+export const ASSESSMENT_RESOURCES = "assessment-resources";
+export const SUBJECT = "subject";
+export const EXTERNAL_LEARNING_RESOURCES = "external-learning-resources";
+export const SOURCE_MATERIAL = "source-material";
+export const LEARNING_PATH = "learning-path";
+export const TOPIC = "topic";
+export const MULTIDISCIPLINARY_TOPIC = "multidisciplinary-topic";
 
 export const contentTypes = {
   SUBJECT_MATERIAL,
@@ -28,23 +28,23 @@ export const contentTypes = {
   MULTIDISCIPLINARY_TOPIC,
 };
 
-export const RESOURCE_TYPE_LEARNING_PATH = 'urn:resourcetype:learningPath';
-export const RESOURCE_TYPE_SUBJECT_MATERIAL = 'urn:resourcetype:subjectMaterial';
-export const RESOURCE_TYPE_TASKS_AND_ACTIVITIES = 'urn:resourcetype:tasksAndActivities';
-export const RESOURCE_TYPE_ASSESSMENT_RESOURCES = 'urn:resourcetype:reviewResource';
-export const RESOURCE_TYPE_EXTERNAL_LEARNING_RESOURCES = 'urn:resourcetype:externalResource';
-export const RESOURCE_TYPE_SOURCE_MATERIAL = 'urn:resourcetype:SourceMaterial';
+export const RESOURCE_TYPE_LEARNING_PATH = "urn:resourcetype:learningPath";
+export const RESOURCE_TYPE_SUBJECT_MATERIAL = "urn:resourcetype:subjectMaterial";
+export const RESOURCE_TYPE_TASKS_AND_ACTIVITIES = "urn:resourcetype:tasksAndActivities";
+export const RESOURCE_TYPE_ASSESSMENT_RESOURCES = "urn:resourcetype:reviewResource";
+export const RESOURCE_TYPE_EXTERNAL_LEARNING_RESOURCES = "urn:resourcetype:externalResource";
+export const RESOURCE_TYPE_SOURCE_MATERIAL = "urn:resourcetype:SourceMaterial";
 
 export const ListOfContentTypes = [
-  'SUBJECT_MATERIAL',
-  'TASKS_AND_ACTIVITIES',
-  'ASSESSMENT_RESOURCES',
-  'SUBJECT',
-  'EXTERNAL_LEARNING_RESOURCES',
-  'SOURCE_MATERIAL',
-  'LEARNING_PATH',
-  'TOPIC',
-  'MULTIDISIPLINARY_TOPIC',
+  "SUBJECT_MATERIAL",
+  "TASKS_AND_ACTIVITIES",
+  "ASSESSMENT_RESOURCES",
+  "SUBJECT",
+  "EXTERNAL_LEARNING_RESOURCES",
+  "SOURCE_MATERIAL",
+  "LEARNING_PATH",
+  "TOPIC",
+  "MULTIDISIPLINARY_TOPIC",
 ];
 
 export const contentTypeMapping: Record<string, string> = {
@@ -58,8 +58,8 @@ export const contentTypeMapping: Record<string, string> = {
 };
 
 export const resourceEmbedTypeMapping: Record<string, string> = {
-  image: 'image',
-  video: 'video',
-  concept: 'concept',
-  audio: 'audio',
+  image: "image",
+  video: "video",
+  concept: "concept",
+  audio: "audio",
 };

package/src/model/SubjectCategories.ts

@@ -6,7 +6,7 @@
  *
  */
 
-export const ACTIVE_SUBJECTS = 'active';
-export const ARCHIVE_SUBJECTS = 'archive';
-export const BETA_SUBJECTS = 'beta';
-export const OTHER = 'otherResources';
+export const ACTIVE_SUBJECTS = "active";
+export const ARCHIVE_SUBJECTS = "archive";
+export const BETA_SUBJECTS = "beta";
+export const OTHER = "otherResources";

package/src/model/SubjectTypes.ts

@@ -6,6 +6,6 @@
  *
  */
 
-export const BETA_SUBJECT = 'betaSubject';
-export const SUBJECT = 'subject';
-export const RESOURCE_COLLECTION = 'resourceCollection';
+export const BETA_SUBJECT = "betaSubject";
+export const SUBJECT = "subject";
+export const RESOURCE_COLLECTION = "resourceCollection";

package/src/model/WordClass.ts

@@ -7,39 +7,39 @@
  */
 
 export const wordClass = {
-  adjective: 'adjective',
-  adverb: 'adverb',
-  properNoun: 'proper-noun',
-  auxiliary: 'auxiliary',
-  complement: 'complement',
-  conjunction: 'conjunction',
-  coverb: 'coverb',
-  determiner: 'determiner',
-  interjection: 'interjection',
-  quantifier: 'quantifier',
-  marker: 'marker',
-  modalVerb: 'modal-verb',
-  measureWord: 'measure-word',
-  noun: 'noun',
-  'noun-zh': 'noun-zh',
-  nounPhrase: 'noun-phrase',
-  onomatopoeia: 'onomatopoeia',
-  particle: 'particle',
-  demonstrative: 'demonstrative',
-  personalPronoun: 'personal-pronoun',
-  preposition: 'preposition',
-  pronoun: 'pronoun',
-  questionWord: 'question-word',
-  locationWord: 'location-word',
-  suffix: 'suffix',
-  numeral: 'numeral',
-  timeWord: 'time word',
-  timeExpression: 'time-expression',
-  stativeVerb: 'stative-verb',
-  subordinatingConjunction: 'subordinating-conjunction',
-  exclamationWord: 'exclamation-word',
-  expression: 'expression',
-  verb: 'verb',
-  verbComplement: 'verb-complement',
-  verbObject: 'verb-object',
+  adjective: "adjective",
+  adverb: "adverb",
+  properNoun: "proper-noun",
+  auxiliary: "auxiliary",
+  complement: "complement",
+  conjunction: "conjunction",
+  coverb: "coverb",
+  determiner: "determiner",
+  interjection: "interjection",
+  quantifier: "quantifier",
+  marker: "marker",
+  modalVerb: "modal-verb",
+  measureWord: "measure-word",
+  noun: "noun",
+  "noun-zh": "noun-zh",
+  nounPhrase: "noun-phrase",
+  onomatopoeia: "onomatopoeia",
+  particle: "particle",
+  demonstrative: "demonstrative",
+  personalPronoun: "personal-pronoun",
+  preposition: "preposition",
+  pronoun: "pronoun",
+  questionWord: "question-word",
+  locationWord: "location-word",
+  suffix: "suffix",
+  numeral: "numeral",
+  timeWord: "time word",
+  timeExpression: "time-expression",
+  stativeVerb: "stative-verb",
+  subordinatingConjunction: "subordinating-conjunction",
+  exclamationWord: "exclamation-word",
+  expression: "expression",
+  verb: "verb",
+  verbComplement: "verb-complement",
+  verbObject: "verb-object",
 };

package/src/model/index.ts

@@ -6,10 +6,10 @@
  *
  */
 
-import { contentTypes, contentTypeMapping, resourceEmbedTypeMapping } from './ContentType';
-import * as subjectCategories from './SubjectCategories';
-import * as subjectTypes from './SubjectTypes';
-import * as wordClass from './WordClass';
+import { contentTypes, contentTypeMapping, resourceEmbedTypeMapping } from "./ContentType";
+import * as subjectCategories from "./SubjectCategories";
+import * as subjectTypes from "./SubjectTypes";
+import * as wordClass from "./WordClass";
 
 const model = {
   contentTypes,

package/src/types.ts

@@ -6,9 +6,9 @@
  *
  */
 
-import { ReactNode } from 'react';
+import { ReactNode } from "react";
 
-const locales = ['nb', 'nn', 'en', 'se', 'sma'] as const;
+const locales = ["nb", "nn", "en", "se", "sma"] as const;
 export type Locale = (typeof locales)[number];
 
 export type Link = {
@@ -127,6 +127,6 @@ export interface CoreElementsItemType extends GrepCode {
 }
 
 export type NotionMedia = {
-  type: 'video' | 'other';
+  type: "video" | "other";
   element: ReactNode;
 };

package/src/utils/__tests__/relativeUrl-test.tsx

@@ -6,67 +6,73 @@
  *
  */
 
-import { getPossiblyRelativeUrl } from '../relativeUrl';
+import { getPossiblyRelativeUrl } from "../relativeUrl";
 
-describe('getPossibleRelativeUrl', () => {
-  it('returns a relative URL for NDLA urls', () => {
-    const url = 'https://ndla.no/article/123';
-    const pathname = 'https://ndla.no/about/hvem-er-vi';
+describe("getPossibleRelativeUrl", () => {
+  it("returns a relative URL for NDLA urls", () => {
+    const url = "https://ndla.no/article/123";
+    const pathname = "https://ndla.no/about/hvem-er-vi";
 
-    expect(getPossiblyRelativeUrl(url, pathname)).toEqual('/article/123');
+    expect(getPossiblyRelativeUrl(url, pathname)).toEqual("/article/123");
   });
-  it('does not return relative URLs for non-NDLA urls', () => {
-    const url = 'https://google.com';
-    const pathname = 'https://ndla.no/about/hvem-er-vi';
+  it("does not return relative URLs for non-NDLA urls", () => {
+    const url = "https://google.com";
+    const pathname = "https://ndla.no/about/hvem-er-vi";
 
-    expect(getPossiblyRelativeUrl(url, pathname)).toEqual('https://google.com');
+    expect(getPossiblyRelativeUrl(url, pathname)).toEqual("https://google.com");
   });
-  it('handles www just fine', () => {
-    const url = 'https://www.ndla.no/article/123';
-    const pathname = 'https://www.ndla.no/about/hvem-er-vi';
+  it("handles www just fine", () => {
+    const url = "https://www.ndla.no/article/123";
+    const pathname = "https://www.ndla.no/about/hvem-er-vi";
 
-    expect(getPossiblyRelativeUrl(url, pathname)).toEqual('/article/123');
+    expect(getPossiblyRelativeUrl(url, pathname)).toEqual("/article/123");
   });
-  it('handles other environments', () => {
-    const url = 'https://test.ndla.no/article/123';
-    const pathname = 'https://test.ndla.no/about/hvem-er-vi';
+  it("handles other environments", () => {
+    const url = "https://test.ndla.no/article/123";
+    const pathname = "https://test.ndla.no/about/hvem-er-vi";
 
-    expect(getPossiblyRelativeUrl(url, pathname)).toEqual('/article/123');
+    expect(getPossiblyRelativeUrl(url, pathname)).toEqual("/article/123");
   });
-  it('strips out the languages from the URL if pathname has no language set', () => {
-    const url = 'https://test.ndla.no/nb/article/123';
-    const pathname = 'https://test.ndla.no/about/hvem-er-vi';
+  it("strips out the languages from the URL if pathname has no language set", () => {
+    const url = "https://test.ndla.no/nb/article/123";
+    const pathname = "https://test.ndla.no/about/hvem-er-vi";
 
-    expect(getPossiblyRelativeUrl(url, pathname)).toEqual('/article/123');
+    expect(getPossiblyRelativeUrl(url, pathname)).toEqual("/article/123");
   });
-  it('replaces languages from the URL that do not match the pathname language', () => {
-    const url = 'https://test.ndla.no/nb/article/123';
-    const pathname = 'https://test.ndla.no/nn/about/hvem-er-vi';
+  it("replaces languages from the URL that do not match the pathname language", () => {
+    const url = "https://test.ndla.no/nb/article/123";
+    const pathname = "https://test.ndla.no/nn/about/hvem-er-vi";
 
-    expect(getPossiblyRelativeUrl(url, pathname)).toEqual('/nn/article/123');
+    expect(getPossiblyRelativeUrl(url, pathname)).toEqual("/nn/article/123");
   });
-  it('returns a base url if the url only contains a language tag', () => {
-    const url = 'https://ndla.no/nb';
-    const pathname = 'https://ndla.no/about/hvem-er-vi';
+  it("returns a base url if the url only contains a language tag", () => {
+    const url = "https://ndla.no/nb";
+    const pathname = "https://ndla.no/about/hvem-er-vi";
 
-    expect(getPossiblyRelativeUrl(url, pathname)).toEqual('/');
+    expect(getPossiblyRelativeUrl(url, pathname)).toEqual("/");
   });
-  it('Handles trailing backslash', () => {
-    const url = 'https://ndla.no/nb/';
-    const pathname = 'https://ndla.no/about/hvem-er-vi';
+  it("Handles trailing backslash", () => {
+    const url = "https://ndla.no/nb/";
+    const pathname = "https://ndla.no/about/hvem-er-vi";
 
-    expect(getPossiblyRelativeUrl(url, pathname)).toEqual('/');
+    expect(getPossiblyRelativeUrl(url, pathname)).toEqual("/");
   });
-  it('handles www', () => {
-    const url = 'https://www.ndla.no';
-    const pathname = 'https://ndla.no/about/hvem-er-vi';
+  it("handles www", () => {
+    const url = "https://www.ndla.no";
+    const pathname = "https://ndla.no/about/hvem-er-vi";
 
-    expect(getPossiblyRelativeUrl(url, pathname)).toEqual('/');
+    expect(getPossiblyRelativeUrl(url, pathname)).toEqual("/");
   });
-  it('handles ports', () => {
-    const url = 'https://www.ndla.no:8080';
-    const pathname = 'https://ndla.no/about/hvem-er-vi';
+  it("handles ports", () => {
+    const url = "https://www.ndla.no:8080";
+    const pathname = "https://ndla.no/about/hvem-er-vi";
 
-    expect(getPossiblyRelativeUrl(url, pathname)).toEqual('/');
+    expect(getPossiblyRelativeUrl(url, pathname)).toEqual("/");
+  });
+  it("handles mailto from markdown", () => {
+    const url = "mailto:test@ndla.no";
+    const pathname = "https://ndla.no/about/hvem-er-vi";
+
+    expect(getPossiblyRelativeUrl(url, pathname)).toEqual("mailto:test@ndla.no");
   });
 });

package/src/utils/relativeUrl.ts

@@ -6,29 +6,31 @@
  *
  */
 
-import { supportedTranslationLanguages } from '../i18n/i18n';
+import { supportedTranslationLanguages } from "../i18n/i18n";
 
 const ENV_REGEX = /(staging|test)\.?/;
-const LANGUAGE_REGEX = new RegExp(`^\\/((?:${supportedTranslationLanguages.join('|')})(?:$|\\/))`, '');
+const LANGUAGE_REGEX = new RegExp(`^\\/((?:${supportedTranslationLanguages.join("|")})(?:$|\\/))`, "");
 
 const NDLA_URL = /(.*\.)?ndla.no.*/;
 const REPLACE_WWW = /^www\./;
 
 export const getPossiblyRelativeUrl = (url: string, path?: string) => {
   if (!path) return url;
+  // If url is a mailto link, return url as is.
+  if (url.startsWith("mailto:")) return url;
   // If not on NDLA, or if url is not a NDLA url, return url as is
   if (!NDLA_URL.test(url) || !NDLA_URL.test(path)) return url;
   //Remove environment info
-  const urlObj = new URL(url.replace(ENV_REGEX, ''));
-  const pathObj = new URL(path.replace(ENV_REGEX, ''));
+  const urlObj = new URL(url.replace(ENV_REGEX, ""));
+  const pathObj = new URL(path.replace(ENV_REGEX, ""));
   // If the host is the same, return the relative path
-  if (urlObj.hostname.replace(REPLACE_WWW, '') === pathObj.hostname.replace(REPLACE_WWW, '')) {
+  if (urlObj.hostname.replace(REPLACE_WWW, "") === pathObj.hostname.replace(REPLACE_WWW, "")) {
     // Replace the language part of the url with the language part of the path
     // If the path language part does not exist, remove it.
     const urlMatch = urlObj.pathname.match(LANGUAGE_REGEX);
     const pathMatch = pathObj.pathname.match(LANGUAGE_REGEX);
     if (urlMatch?.[1] && urlMatch?.[1] !== pathMatch?.[1]) {
-      return urlObj.pathname.replace(urlMatch[1], pathMatch?.[1] || '');
+      return urlObj.pathname.replace(urlMatch[1], pathMatch?.[1] || "");
     }
 
     return urlObj.pathname;

package/src/utils/resourceTypeColor.tsx

@@ -6,9 +6,9 @@
  *
  */
 
-import { colors } from '@ndla/core';
-import constants from '../model';
-import { resourceEmbedTypeMapping } from '../model/ContentType';
+import { colors } from "@ndla/core";
+import constants from "../model";
+import { resourceEmbedTypeMapping } from "../model/ContentType";
 const { contentTypes } = constants;
 
 export const resourceTypeColor = (type: string) => {
@@ -37,7 +37,7 @@ export const resourceTypeColor = (type: string) => {
     case resourceEmbedTypeMapping.audio:
       return colors.brand.greyLight;
     default:
-      return '';
+      return "";
   }
 };