Merge branch 'main' into dont-show-track-selection

.dockerignore

@@ -0,0 +1,6 @@
+.dockerignore
+.git/
+.github/
+build/
+Dockerfile
+node_modules/

.eslintrc.js

@@ -1,12 +1,7 @@
 module.exports = {
   extends: [
     "@opencast/eslint-config-ts-react",
-    "react-app/jest",
   ],
-  rules: {
-    // Currently 120 warnings.
-    "@typescript-eslint/no-explicit-any": "off",
-  },
   overrides: [
     {
       files: ["./*.js"],

.github/build-release.sh

@@ -3,7 +3,7 @@
 # Build integrated version
 rm -rf build/
 export PUBLIC_URL=/editor-ui
-export REACT_APP_SETTINGS_PATH="/ui/config/editor/editor-settings.toml"
+export VITE_APP_SETTINGS_PATH="/ui/config/editor/editor-settings.toml"
 npm run build
 
 FILENAME="oc-editor-$(date --utc +%F).tar.gz"

.github/generate-lngs.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+declare -A country_language_map
+declare -a order
+
+# Loop through each file in the directory
+for file in ??-??.json; do
+    if [ -f "$file" ]; then
+        # Extract country name and language code from the filename
+        country=$(basename "$file" .json | cut -d '-' -f 1)
+        language_code=$(basename "$file" .json)
+
+        if [ ! "${country_language_map[$country]}" ]; then
+            order+=("$country")
+        fi
+
+        # Check if the country already exists in the map
+        if [ -n "${country_language_map[$country]}" ]; then
+            country_language_map["$country"]+=" $language_code"
+        else
+            country_language_map["$country"]="$language_code"
+        fi
+    fi
+done
+
+echo "export const languages = new Map<string, string>(["
+# Print the country-language mappings
+for i in "${!order[@]}"; do
+    country=${order[$i]}
+    languages=()
+    for language in ${country_language_map[$country]}; do
+        languages+=("$language")
+    done
+    if [ ${#languages[@]} -eq 1 ]; then
+        echo "  [\"$country\", \"${languages[0]}\"],"
+    else
+        for language in "${languages[@]}"; do
+            echo "  [\"$language\", \"$language\"],"
+        done
+    fi
+done
+echo "]);"

.github/mock/editor/ID-dual-stream-demo/metadata.json

@@ -1 +1,217 @@
-[{"flavor":"dublincore\/episode","title":"EVENTS.EVENTS.DETAILS.CATALOG.EPISODE","fields":[{"readOnly":false,"id":"title","label":"EVENTS.EVENTS.DETAILS.METADATA.TITLE","type":"text","value":"Dual-Stream Demo","required":true},{"readOnly":false,"id":"subject","label":"EVENTS.EVENTS.DETAILS.METADATA.SUBJECT","type":"text","value":"","required":false},{"readOnly":false,"id":"description","label":"EVENTS.EVENTS.DETAILS.METADATA.DESCRIPTION","type":"text_long","value":"","required":false},{"translatable":true,"readOnly":false,"id":"language","label":"EVENTS.EVENTS.DETAILS.METADATA.LANGUAGE","collection":{"LANGUAGES.SLOVENIAN":"slv","LANGUAGES.PORTUGUESE":"por","LANGUAGES.ROMANSH":"roh","LANGUAGES.ARABIC":"ara","LANGUAGES.POLISH":"pol","LANGUAGES.ITALIAN":"ita","LANGUAGES.CHINESE":"zho","LANGUAGES.FINNISH":"fin","LANGUAGES.DANISH":"dan","LANGUAGES.UKRAINIAN":"ukr","LANGUAGES.FRENCH":"fra","LANGUAGES.SPANISH":"spa","LANGUAGES.GERMAN_CH":"gsw","LANGUAGES.NORWEGIAN":"nor","LANGUAGES.RUSSIAN":"rus","LANGUAGES.JAPANESE":"jpx","LANGUAGES.DUTCH":"nld","LANGUAGES.TURKISH":"tur","LANGUAGES.HINDI":"hin","LANGUAGES.SWEDISH":"swa","LANGUAGES.ENGLISH":"eng","LANGUAGES.GERMAN":"deu"},"type":"text","value":"","required":false},{"readOnly":false,"id":"rightsHolder","label":"EVENTS.EVENTS.DETAILS.METADATA.RIGHTS","type":"text","value":"","required":false},{"translatable":true,"readOnly":false,"id":"license","label":"EVENTS.EVENTS.DETAILS.METADATA.LICENSE","collection":{"{\"label\":\"EVENTS.LICENSE.CC0\", \"order\":8, \"selectable\": true}":"CC0","{\"label\":\"EVENTS.LICENSE.CCBYND\", \"order\":4, \"selectable\": true}":"CC-BY-ND","{\"label\":\"EVENTS.LICENSE.CCBYNCND\", \"order\":7, \"selectable\": true}":"CC-BY-NC-ND","{\"label\":\"EVENTS.LICENSE.CCBYNCSA\", \"order\":6, \"selectable\": true}":"CC-BY-NC-SA","{\"label\":\"EVENTS.LICENSE.ALLRIGHTS\", \"order\":1, \"selectable\": true}":"ALLRIGHTS","{\"label\":\"EVENTS.LICENSE.CCBYSA\", \"order\":3, \"selectable\": true}":"CC-BY-SA","{\"label\":\"EVENTS.LICENSE.CCBYNC\", \"order\":5, \"selectable\": true}":"CC-BY-NC","{\"label\":\"EVENTS.LICENSE.CCBY\", \"order\":2, \"selectable\": true}":"CC-BY"},"type":"ordered_text","value":"CC-BY-SA","required":false},{"translatable":false,"readOnly":false,"id":"isPartOf","label":"EVENTS.EVENTS.DETAILS.METADATA.SERIES","collection":{"Wiki Commons Content":"ID-wiki-commons","AV-Portal Content":"ID-av-portal","Open Media for Opencast":"ID-openmedia-opencast","Blender Foundation Productions":"ID-blender-foundation"},"type":"text","value":"","required":false},{"translatable":false,"readOnly":false,"id":"creator","label":"EVENTS.EVENTS.DETAILS.METADATA.PRESENTERS","collection":{"NASA Johnson":"NASA Johnson","NASA":"NASA","Rosatrieu":"Rosatrieu","I. Elgamal":"I. Elgamal","TIB AV-Portal Hannover":"TIB AV-Portal Hannover","Wiki Commons":"Wiki Commons","Lars Kiesow":"Lars Kiesow","Andy Goralczyk":"Andy Goralczyk","Olaf Schulte":"Olaf Schulte","Administrator":"Administrator","Nature Stock Videos":"Nature Stock Videos","Capture Agent":"Capture Agent","Blender Foundation":"Blender Foundation","Pixabay":"Pixabay","System User":"System User"},"type":"mixed_text","value":["Lars Kiesow"],"required":false},{"translatable":false,"readOnly":false,"id":"contributor","label":"EVENTS.EVENTS.DETAILS.METADATA.CONTRIBUTORS","collection":{"NASA Johnson":"NASA Johnson","NASA":"NASA","Rosatrieu":"Rosatrieu","I. Elgamal":"I. Elgamal","TIB AV-Portal Hannover":"TIB AV-Portal Hannover","Wiki Commons":"Wiki Commons","Lars Kiesow":"Lars Kiesow","Andy Goralczyk":"Andy Goralczyk","Olaf Schulte":"Olaf Schulte","Administrator":"Administrator","Nature Stock Videos":"Nature Stock Videos","Capture Agent":"Capture Agent","Blender Foundation":"Blender Foundation","Pixabay":"Pixabay","System User":"System User"},"type":"mixed_text","value":[],"required":false},{"readOnly":false,"id":"startDate","label":"EVENTS.EVENTS.DETAILS.METADATA.START_DATE","type":"date","value":"2022-02-03T01:02:00.000Z","required":false},{"readOnly":false,"id":"duration","label":"EVENTS.EVENTS.DETAILS.METADATA.DURATION","type":"text","value":"00:00:00","required":false},{"readOnly":false,"id":"location","label":"EVENTS.EVENTS.DETAILS.METADATA.LOCATION","type":"text","value":"","required":false},{"readOnly":false,"id":"source","label":"EVENTS.EVENTS.DETAILS.METADATA.SOURCE","type":"text","value":"","required":false},{"readOnly":true,"id":"created","label":"EVENTS.EVENTS.DETAILS.METADATA.CREATED","type":"date","value":"2022-02-03T01:02:00.000Z","required":false},{"readOnly":true,"id":"publisher","label":"EVENTS.EVENTS.DETAILS.METADATA.PUBLISHER","type":"text","value":"","required":false},{"readOnly":true,"id":"identifier","label":"EVENTS.EVENTS.DETAILS.METADATA.ID","type":"text","value":"ID-dual-stream-demo","required":false}]}]
+[
+    {
+        "flavor": "dublincore\/episode",
+        "title": "EVENTS.EVENTS.DETAILS.CATALOG.EPISODE",
+        "fields": [
+            {
+                "readOnly": false,
+                "id": "title",
+                "label": "EVENTS.EVENTS.DETAILS.METADATA.TITLE",
+                "type": "text",
+                "value": "Dual-Stream Demo",
+                "required": true
+            },
+            {
+                "readOnly": false,
+                "id": "subject",
+                "label": "EVENTS.EVENTS.DETAILS.METADATA.SUBJECT",
+                "type": "text",
+                "value": "",
+                "required": false
+            },
+            {
+                "readOnly": false,
+                "id": "description",
+                "label": "EVENTS.EVENTS.DETAILS.METADATA.DESCRIPTION",
+                "type": "text_long",
+                "value": "",
+                "required": false
+            },
+            {
+                "translatable": true,
+                "readOnly": false,
+                "id": "language",
+                "label": "EVENTS.EVENTS.DETAILS.METADATA.LANGUAGE",
+                "collection": {
+                    "LANGUAGES.SLOVENIAN": "slv",
+                    "LANGUAGES.PORTUGUESE": "por",
+                    "LANGUAGES.ROMANSH": "roh",
+                    "LANGUAGES.ARABIC": "ara",
+                    "LANGUAGES.POLISH": "pol",
+                    "LANGUAGES.ITALIAN": "ita",
+                    "LANGUAGES.CHINESE": "zho",
+                    "LANGUAGES.FINNISH": "fin",
+                    "LANGUAGES.DANISH": "dan",
+                    "LANGUAGES.UKRAINIAN": "ukr",
+                    "LANGUAGES.FRENCH": "fra",
+                    "LANGUAGES.SPANISH": "spa",
+                    "LANGUAGES.GERMAN_CH": "gsw",
+                    "LANGUAGES.NORWEGIAN": "nor",
+                    "LANGUAGES.RUSSIAN": "rus",
+                    "LANGUAGES.JAPANESE": "jpx",
+                    "LANGUAGES.DUTCH": "nld",
+                    "LANGUAGES.TURKISH": "tur",
+                    "LANGUAGES.HINDI": "hin",
+                    "LANGUAGES.SWEDISH": "swa",
+                    "LANGUAGES.ENGLISH": "eng",
+                    "LANGUAGES.GERMAN": "deu"
+                },
+                "type": "text",
+                "value": "",
+                "required": false
+            },
+            {
+                "readOnly": false,
+                "id": "rightsHolder",
+                "label": "EVENTS.EVENTS.DETAILS.METADATA.RIGHTS",
+                "type": "text",
+                "value": "",
+                "required": false
+            },
+            {
+                "translatable": true,
+                "readOnly": false,
+                "id": "license",
+                "label": "EVENTS.EVENTS.DETAILS.METADATA.LICENSE",
+                "collection": {
+                    "{\"label\":\"EVENTS.LICENSE.CC0\", \"order\":8, \"selectable\": true}": "CC0",
+                    "{\"label\":\"EVENTS.LICENSE.CCBYND\", \"order\":4, \"selectable\": true}": "CC-BY-ND",
+                    "{\"label\":\"EVENTS.LICENSE.CCBYNCND\", \"order\":7, \"selectable\": true}": "CC-BY-NC-ND",
+                    "{\"label\":\"EVENTS.LICENSE.CCBYNCSA\", \"order\":6, \"selectable\": true}": "CC-BY-NC-SA",
+                    "{\"label\":\"EVENTS.LICENSE.ALLRIGHTS\", \"order\":1, \"selectable\": true}": "ALLRIGHTS",
+                    "{\"label\":\"EVENTS.LICENSE.CCBYSA\", \"order\":3, \"selectable\": true}": "CC-BY-SA",
+                    "{\"label\":\"EVENTS.LICENSE.CCBYNC\", \"order\":5, \"selectable\": true}": "CC-BY-NC",
+                    "{\"label\":\"EVENTS.LICENSE.CCBY\", \"order\":2, \"selectable\": true}": "CC-BY"
+                },
+                "type": "ordered_text",
+                "value": "CC-BY-SA",
+                "required": false
+            },
+            {
+                "translatable": false,
+                "readOnly": false,
+                "id": "isPartOf",
+                "label": "EVENTS.EVENTS.DETAILS.METADATA.SERIES",
+                "collection": {
+                    "Wiki Commons Content": "ID-wiki-commons",
+                    "AV-Portal Content": "ID-av-portal",
+                    "Open Media for Opencast": "ID-openmedia-opencast",
+                    "Blender Foundation Productions": "ID-blender-foundation"
+                },
+                "type": "text",
+                "value": "",
+                "required": false
+            },
+            {
+                "translatable": false,
+                "readOnly": false,
+                "id": "creator",
+                "label": "EVENTS.EVENTS.DETAILS.METADATA.PRESENTERS",
+                "collection": {
+                    "NASA Johnson": "NASA Johnson",
+                    "NASA": "NASA",
+                    "Rosatrieu": "Rosatrieu",
+                    "I. Elgamal": "I. Elgamal",
+                    "TIB AV-Portal Hannover": "TIB AV-Portal Hannover",
+                    "Wiki Commons": "Wiki Commons",
+                    "Lars Kiesow": "Lars Kiesow",
+                    "Andy Goralczyk": "Andy Goralczyk",
+                    "Olaf Schulte": "Olaf Schulte",
+                    "Administrator": "Administrator",
+                    "Nature Stock Videos": "Nature Stock Videos",
+                    "Capture Agent": "Capture Agent",
+                    "Blender Foundation": "Blender Foundation",
+                    "Pixabay": "Pixabay",
+                    "System User": "System User"
+                },
+                "type": "mixed_text",
+                "value": [
+                    "Lars Kiesow"
+                ],
+                "required": false
+            },
+            {
+                "translatable": false,
+                "readOnly": false,
+                "id": "contributor",
+                "label": "EVENTS.EVENTS.DETAILS.METADATA.CONTRIBUTORS",
+                "collection": {
+                    "NASA Johnson": "NASA Johnson",
+                    "NASA": "NASA",
+                    "Rosatrieu": "Rosatrieu",
+                    "I. Elgamal": "I. Elgamal",
+                    "TIB AV-Portal Hannover": "TIB AV-Portal Hannover",
+                    "Wiki Commons": "Wiki Commons",
+                    "Lars Kiesow": "Lars Kiesow",
+                    "Andy Goralczyk": "Andy Goralczyk",
+                    "Olaf Schulte": "Olaf Schulte",
+                    "Administrator": "Administrator",
+                    "Nature Stock Videos": "Nature Stock Videos",
+                    "Capture Agent": "Capture Agent",
+                    "Blender Foundation": "Blender Foundation",
+                    "Pixabay": "Pixabay",
+                    "System User": "System User"
+                },
+                "type": "mixed_text",
+                "value": [],
+                "required": false
+            },
+            {
+                "readOnly": false,
+                "id": "startDate",
+                "label": "EVENTS.EVENTS.DETAILS.METADATA.START_DATE",
+                "type": "date",
+                "value": "2022-02-03T01:02:00.000Z",
+                "required": false
+            },
+            {
+                "readOnly": false,
+                "id": "duration",
+                "label": "EVENTS.EVENTS.DETAILS.METADATA.DURATION",
+                "type": "text",
+                "value": "00:01:04",
+                "required": false
+            },
+            {
+                "readOnly": false,
+                "id": "location",
+                "label": "EVENTS.EVENTS.DETAILS.METADATA.LOCATION",
+                "type": "text",
+                "value": "",
+                "required": false
+            },
+            {
+                "readOnly": false,
+                "id": "source",
+                "label": "EVENTS.EVENTS.DETAILS.METADATA.SOURCE",
+                "type": "text",
+                "value": "",
+                "required": false
+            },
+            {
+                "readOnly": true,
+                "id": "created",
+                "label": "EVENTS.EVENTS.DETAILS.METADATA.CREATED",
+                "type": "date",
+                "value": "2022-02-03T01:02:00.000Z",
+                "required": false
+            },
+            {
+                "readOnly": true,
+                "id": "publisher",
+                "label": "EVENTS.EVENTS.DETAILS.METADATA.PUBLISHER",
+                "type": "text",
+                "value": "",
+                "required": false
+            },
+            {
+                "readOnly": true,
+                "id": "identifier",
+                "label": "EVENTS.EVENTS.DETAILS.METADATA.ID",
+                "type": "text",
+                "value": "ID-dual-stream-demo",
+                "required": false
+            }
+        ]
+    }
+]

.github/release.yml

@@ -13,6 +13,7 @@ changelog:
     - title: New Features
       labels:
         - type:feature
+        - type:enhancement
 
     - title: Usability and Accessibility
       labels:
@@ -30,4 +31,4 @@ changelog:
 
     - title: Other Changes
       labels:
-        - "type:*"
+        - "*"

.github/workflows/playwright-test.yml

@@ -34,7 +34,7 @@ jobs:
     - name: Prepare configuration
       run: >
         sed -i
-        's_https://develop.opencast.org_http://localhost:3000_'
+        's_https://develop.opencast.org_http://localhost:5173_'
         public/editor-settings.toml
 
     - name: Prepare mock files
@@ -46,7 +46,7 @@ jobs:
         cp public/editor-settings.toml build/
 
     - name: Use production build for testing
-      run: sed -i 's/npm run start/python -m http.server --bind 127.0.0.1 --directory build 3000/' playwright.config.ts
+      run: sed -i 's/npm run start/python -m http.server --bind 127.0.0.1 --directory build 5173/' playwright.config.ts
 
     - name: Run playwright-test
       run: npx playwright test --config=playwright.config.ts

.github/workflows/update-translations.yml

@@ -34,10 +34,7 @@ jobs:
 
       - name: update language list
         working-directory: src/i18n/locales
-        run: |
-          echo -n '[ "' > locales.json
-          echo -n ??-??.json | sed 's/  */", "/g' >> locales.json
-          echo '" ]' >> locales.json
+        run: $GITHUB_WORKSPACE/.github/generate-lngs.sh > ../lngs-generated.ts
 
       - name: upload translations
         run: |

.gitignore

@@ -7,6 +7,7 @@
 
 # testing
 /coverage
+/playwright-report
 
 # production
 /build