Merge branch 'main' into display-conflicts-scheduling-new-event

.crowdin.yaml

@@ -4,5 +4,5 @@ base_path: .
 preserve_hierarchy: true
 
 files:
-  - source: '/app/src/i18n/org/opencastproject/adminui/languages/lang-en_US.json'
-    translation: '/app/src/i18n/org/opencastproject/adminui/languages/lang-%locale_with_underscore%.json'
+  - source: '/src/i18n/org/opencastproject/adminui/languages/lang-en_US.json'
+    translation: '/src/i18n/org/opencastproject/adminui/languages/lang-%locale_with_underscore%.json'

.github/build-release.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 
 # Build integrated version
-cd ../app
+cd ..
 rm -rf build/
 export PUBLIC_URL=/admin-ui
 CI=false npm run build
 
-FILENAME="oc-admin-ui-$(date --utc +%F).tar.gz"
+FILENAME="oc-admin-ui-$(date -u +%F).tar.gz"
 cd build
 tar -czf ../$FILENAME *

.github/dependabot.yml

@@ -1,10 +1,17 @@
 version: 2
 updates:
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: monthly
-    time: "04:00"
-  open-pull-requests-limit: 15
-  labels:
-    - dependencies
+
+  # GHA
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: monthly
+
+  # Javascript
+  - package-ecosystem: npm
+    directory: /
+    schedule:
+      interval: monthly
+    open-pull-requests-limit: 15
+    labels:
+      - dependencies

.github/workflows/check-icla.yml

@@ -0,0 +1,36 @@
+name: Check ICLA
+on:
+  pull_request_target:
+    types:
+      - opened
+
+jobs:
+  main:
+    if: github.event.pull_request.user.login != 'dependabot[bot]'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Python module
+        run: pip install apereocla
+
+      - name: Check Apereo ICLA for GitHub user
+        run: apereocla -g "${{ github.event.pull_request.user.login }}"
+
+      - name: Comment if no CLA has been filed
+        if: ${{ failure() }}
+        uses: thollander/actions-comment-pull-request@main
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          message: >
+            Hi @${{ github.event.pull_request.user.login }}
+
+            Thank you for contributing to the Opencast Editor.
+
+            We noticed that you have not yet filed an [Individual Contributor License Agreement](https://www.apereo.org/licensing/agreements/icla).
+            Doing that (once) helps us to ensure that Opencast stays free for all.
+            If you make your contribution on behalf of an institution, you might also want to file a
+            [Corporate Contributor License Agreement](https://www.apereo.org/licensing/agreements/ccla)
+            (giving you as individual contributor a bit more security as well). It can take a while for
+            this bot to find out about new filings, so if you just filed one or both of the above do not
+            worry about this message!
+
+            Please let us know if you have any questions regarding the CLA.

.github/workflows/create-release.yml

@@ -11,25 +11,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: use node.js 16.x
-        uses: actions/setup-node@v3
+      - name: get node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
 
       - name: download dependencies
         run: npm ci
-        working-directory: ./app
 
       - name: create release tarball
-        run: ../.github/build-release.sh
-        working-directory: ./app
+        run: ./.github/build-release.sh
 
       - name: create new release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
-          files: ./app/oc-admin-ui-*.tar.gz
+          files: ./oc-admin-ui-*.tar.gz
           draft: true
           fail_on_unmatched_files: true
-          generate_release_notes: true
+          generate_release_notes: true

.github/workflows/crowdin-deploy-keys.yml

@@ -0,0 +1,28 @@
+name: Deploy Crowdin keys
+
+on:
+  push:
+    branches:
+      - main
+
+concurrency:
+  group: crowdin-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  deploy-translation-keys:
+    if: github.repository_owner == 'opencast'
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: prepare crowdin client
+      run: |
+        wget --quiet https://artifacts.crowdin.com/repo/deb/crowdin3.deb
+        sudo dpkg -i crowdin3.deb
+
+    - name: upload translation source
+      env:
+        CROWDIN_TOKEN: ${{ secrets.CROWDIN_TOKEN }}
+      run: |
+        crowdin upload sources --config .crowdin.yaml -b main

.github/workflows/test.yml

@@ -0,0 +1,27 @@
+name: Test build
+
+on:
+  push:
+    branches-ignore:
+      - 'dependabot/**'
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout code
+        uses: actions/checkout@v4
+
+      - name: get node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: download dependencies
+        run: npm ci
+
+      - name: build project
+        env:
+          CI: false
+        run: npm run build

.github/workflows/update-translations.yml

@@ -10,7 +10,7 @@ jobs:
     if: github.repository_owner == 'opencast'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: prepare git
         run: |
@@ -27,9 +27,9 @@ jobs:
           crowdin download --config .crowdin.yaml -b admin-ui-picard
       - name: add new translations
         run: |
-          git add /app/src/i18n/org/opencastproject/adminui/languages/
+          git add /src/i18n/org/opencastproject/adminui/languages/
       - name: update language list
-        working-directory: /app/src/i18n/org/opencastproject/adminui/languages/
+        working-directory: /src/i18n/org/opencastproject/adminui/languages/
         run: |
           echo -n '[ "' > locales.json
           echo -n ??-??.json | sed 's/  */", "/g' >> locales.json

.gitignore

@@ -1,23 +1,2 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
 /node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
 /build
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*