Skip to content

Commit 7462b51

Browse files
committed
Merge branch 'main' into scheduling-endtime-display
2 parents 05849e6 + 674c69e commit 7462b51

File tree

320 files changed

+3985
-17314
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

320 files changed

+3985
-17314
lines changed

.github/workflows/deploy-main.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ jobs:
2626
run: npm ci
2727

2828
- name: build project
29+
env:
30+
NODE_ENV: development
31+
VITE_TEST_SERVER_URL: "https://develop.opencast.org"
32+
VITE_TEST_SERVER_AUTH: "admin:opencast"
2933
run: npm run build
3034

3135
- name: create pages directory
@@ -34,10 +38,6 @@ jobs:
3438
- name: include admin interface
3539
run: mv build gh-pages/admin-ui
3640

37-
- name: include mock data
38-
working-directory: ./gh-pages
39-
run: cp -rv ../test/GET/* .
40-
4141
- name: include landing page
4242
run: cp .github/demo-page.html gh-pages/index.html
4343

.github/workflows/deploy-test.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
- opened
77
- synchronize
88

9+
concurrency:
10+
group: pull-request-page
11+
cancel-in-progress: false
12+
913
jobs:
1014
main:
1115
runs-on: ubuntu-latest
@@ -31,6 +35,9 @@ jobs:
3135
- name: build app
3236
env:
3337
PUBLIC_URL: /${{ steps.build-path.outputs.build }}
38+
NODE_ENV: development
39+
VITE_TEST_SERVER_URL: "https://develop.opencast.org"
40+
VITE_TEST_SERVER_AUTH: "admin:opencast"
3441
run: npm run build
3542

3643
- name: prepare git
@@ -63,10 +70,6 @@ jobs:
6370
run: |
6471
git checkout gh-pages
6572
66-
- name: include mock data
67-
working-directory: admin-interface-test
68-
run: cp -rv ../test/GET/* .
69-
7073
- name: store build
7174
working-directory: admin-interface-test
7275
env:

.github/workflows/remove-test.yml

+4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ on:
55
types:
66
- closed
77

8+
concurrency:
9+
group: pull-request-page
10+
cancel-in-progress: false
11+
812
env:
913
PR_NUMBER: ${{ github.event.pull_request.number }}
1014

README.md

+5
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ PROXY_TARGET=http://localhost:8080 PROXY_AUTH=jdoe:aligator3 npm start
5050
Similarly, if you want to change the port the development server itself runs at,
5151
you can specify an alternative port in the `PORT` environment variable.
5252

53+
If you aim to test against a remote server without using a proxy, you have the option to configure the target server with the `VITE_TEST_SERVER_URL`, and the `VITE_TEST_SERVER_AUTH` environment variables while using the node development mode:
54+
55+
```sh
56+
NODE_ENV=development VITE_TEST_SERVER_URL="https://develop.opencast.org" VITE_TEST_SERVER_AUTH="admin:opencast" npm start
57+
```
5358

5459
How to cut a release for Opencast
5560
---------------------------------

eslint.config.js

+42-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,45 @@
1-
import { FlatCompat } from "@eslint/eslintrc";
1+
import opencastConfig from "@opencast/eslint-config-ts-react";
22

3-
const config = [
4-
{ ignores: ["build"] },
5-
...new FlatCompat({ baseDirectory: import.meta.dirname })
6-
.extends("eslint-config-react-app"),
7-
{ rules: { "no-tabs": ["warn", { allowIndentationTabs: true }]}},
3+
export default [
4+
...opencastConfig,
5+
6+
// Fully ignore some files
7+
{
8+
ignores: ["build/"],
9+
},
10+
11+
{
12+
rules: {
13+
// TODO: We want to turn these on eventually
14+
"arrow-parens": "off",
15+
"camelcase": "off",
16+
"comma-dangle": "off",
17+
"indent": "off",
18+
"keyword-spacing": "off",
19+
"max-len": "off",
20+
"no-extra-boolean-cast": "off",
21+
"no-tabs": "off",
22+
"no-unused-expressions": "off",
23+
"object-curly-spacing": "off",
24+
"prefer-const": "off",
25+
"quotes": "off",
26+
"semi": "off",
27+
"spaced-comment": "off",
28+
"@typescript-eslint/await-thenable": "off",
29+
"@typescript-eslint/no-explicit-any": "off",
30+
"@typescript-eslint/no-floating-promises": "off",
31+
"@typescript-eslint/no-misused-promises": "off",
32+
"@typescript-eslint/no-non-null-asserted-optional-chain": "off",
33+
"@typescript-eslint/no-unsafe-argument": "off",
34+
"@typescript-eslint/no-unsafe-assignment": "off",
35+
"@typescript-eslint/no-unsafe-call": "off",
36+
"@typescript-eslint/no-unsafe-member-access": "off",
37+
"@typescript-eslint/no-unused-expressions": "off",
38+
"@typescript-eslint/no-unused-vars": "off",
39+
"@typescript-eslint/no-unsafe-return": "off",
40+
"@typescript-eslint/require-await": "off",
41+
"@typescript-eslint/unbound-method": "off",
42+
}
43+
}
844
];
945

10-
export default config;

0 commit comments

Comments
 (0)