Skip to content

Commit

Permalink
Merge pull request #523 from kbss-cvut/development
Browse files Browse the repository at this point in the history
[3.2.0] Release
  • Loading branch information
ledsoft authored Sep 23, 2024
2 parents 89d2c2a + c561575 commit 0a64eb0
Show file tree
Hide file tree
Showing 96 changed files with 4,682 additions and 2,074 deletions.
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: 2

updates:
- package-ecosystem: npm
directory: /
schedule:
interval: weekly
target-branch: development
2 changes: 1 addition & 1 deletion .github/workflows/merge-to-protected.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: "16.x"
node-version: "20.x"
- name: Install
run: npm install
- name: Prettier Check
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# BASE STAGE
# Prepare node, copy package.json
FROM node:16-alpine AS base
FROM node:20-alpine AS base
WORKDIR /usr/src/app
COPY package.json package-lock.json ./

Expand Down
7 changes: 7 additions & 0 deletions NEWS.cs.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
#### Verze 3.2.0

- Přidána podpora pro import slovníků z MS Excel.
- Vylepšení výkonu při opakované anotaci pojmů ve slovníku a validaci slovníku.
- Úpravy v UI anotátoru - je možné skrýt výskyty vybraného typu.
- Přidána možnost generovat identifikátory bez znaků s háčky a čárkami.

#### Verze 3.1.3

- Přidána možnost odeslat novému uživateli mail s pozvánkou (admin již nemusí uživateli nastavovat heslo).
Expand Down
7 changes: 7 additions & 0 deletions NEWS.en.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
#### Version 3.2.0

- Added support for importing a vocabulary from MS Excel.
- Optimized performance of repeated term annotation and vocabulary validation.
- Annotator UI improvements, it is now possible to hide occurrences of a selected type.
- Support disabling generation of identifiers containing accented characters.

#### Version 3.1.3

- Added invitation-based new account registration (admin no longer has to set user's password).
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Documentation for developers and system administrators is in the [doc folder](do

## Running TermIt UI

NodeJS and npm are required to build and run TermIt UI. To run the TermIt UI, it is necessary to provide a value for
NodeJS 20 and npm 10 are required to build and run TermIt UI. To run the TermIt UI, it is necessary to provide a value for
`REACT_APP_SERVER_URL` representing the URL of the backend to connect to. Typically, this is done at build time.
See the documentation for more details and other configuration options.

Expand Down
17 changes: 17 additions & 0 deletions craco.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
module.exports = {
webpack: {
configure: {
module: {
rules: [
{
// resolves https://stackoverflow.com/questions/70964723/webpack-5-in-ceate-react-app-cant-resolve-not-fully-specified-routes caused be react-stomp-hooks
test: /\.m?js$/,
resolve: {
fullySpecified: false,
},
},
],
},
},
},
};
14 changes: 11 additions & 3 deletions doc/setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ This guide provides information on how to build and deploy TermIt UI.

### System Requirements

- NodeJS 12.x or later
- npm 6.x or later
- NodeJS 20.x or later
- npm 10.x or later

### Setup

Expand All @@ -27,7 +27,7 @@ The following parameters can be configured for the build:

### Example

1. `npm install`
1. `npm install --legacy-peer-deps`
2. `REACT_APP_SERVER_URL=https://kbss.felk.cvut.cz/termit-server-dev REACT_APP_DEPLOYMENT_NAME=dev REACT_APP_ADMIN_REGISTRATION_ONLY=true npm run build-prod`

## Deployment
Expand All @@ -44,3 +44,11 @@ location accessible via HTTP(S), e.g., into an Apache HTTP server-managed locati
TermIt can operate in one of two authentication modes - using its internal user database and authentication means (default)
or via an OIDC authentication service such as [Keycloak](https://www.keycloak.org/). Corresponding parameters (service
URL, clientId) need to be set up (see the table above for the relevant parameters and explanation).

**example:**

```
REACT_APP_AUTHENTICATION=oidc
REACT_APP_AUTH_SERVER_URL=http://keycloak.lan/realms/termit
REACT_APP_AUTH_CLIENT_ID=termit-ui
```
Loading

0 comments on commit 0a64eb0

Please sign in to comment.