Merge branch 'kbss-cvut:main' into main

akaene · Jan 16, 2024 · 4ef10db · 4ef10db
2 parents b2b5782 + e6a9272
commit 4ef10db
Show file tree

Hide file tree

Showing 7 changed files with 348 additions and 278 deletions.
diff --git a/deploy/internal-auth/.env b/deploy/internal-auth/.env
@@ -5,7 +5,7 @@
 #RECORD_MANAGER_ROOT_PATH=/record-manager-demo
 
 # Prefix for name of all docker containers
-RECORD_SET_NAME=iauth-demo
+RECORD_SET_NAME=rm-iauth-demo
 
 # Host machine port that provides main entrypoint for the application. The application will be locally accessible at http://localhost:$INTERNAL_HOST_PORT/$RECORD_MANAGER_ROOT_PATH (by default it is set to "1235") 
 #INTERNAL_HOST_PORT=1235

diff --git a/deploy/internal-auth/docker-compose.yml b/deploy/internal-auth/docker-compose.yml
@@ -73,6 +73,7 @@ services:
   db-server:
     build:
       context: ../shared/db-server
+    image: ${RECORD_SET_NAME:-rm}-db-server
     container_name: ${RECORD_SET_NAME:-rm}-db-server
     environment:
       GDB_JAVA_OPTS: "-Dgraphdb.external-url=${PUBLIC_ORIGIN:-http://localhost:${INTERNAL_HOST_PORT:-1235}}${RECORD_MANAGER_ROOT_PATH:-/record-manager}/services/db-server"

diff --git a/deploy/keycloak-auth/.env b/deploy/keycloak-auth/.env
@@ -5,7 +5,7 @@
 #RECORD_MANAGER_ROOT_PATH=/record-manager-demo
 
 # Prefix for name of all docker containers
-RECORD_SET_NAME=kauth-demo
+RECORD_SET_NAME=rm-kauth-demo
 
 # Host machine port that provides main entrypoint for the application. The application will be locally accessible at http://localhost:$INTERNAL_HOST_PORT/$RECORD_MANAGER_ROOT_PATH (by default it is set to "1235") 
 #INTERNAL_HOST_PORT=1235

diff --git a/deploy/keycloak-auth/docker-compose.yml b/deploy/keycloak-auth/docker-compose.yml
@@ -79,6 +79,7 @@ services:
   db-server:
     build:
       context: ../shared/db-server
+    image: ${RECORD_SET_NAME:-rm}-db-server
     container_name: ${RECORD_SET_NAME:-rm}-db-server
     environment:
       GDB_JAVA_OPTS: "-Dgraphdb.external-url=${PUBLIC_ORIGIN:-http://localhost:${INTERNAL_HOST_PORT:-1235}}${RECORD_MANAGER_ROOT_PATH:-/record-manager}/services/db-server"

diff --git a/js/components/record/TypeaheadAnswer.js b/js/components/record/TypeaheadAnswer.js
@@ -1,6 +1,6 @@
 import React, {useEffect, useState} from "react";
 import {Constants, JsonLdObjectUtils} from "@kbss-cvut/s-forms";
-import JsonLdUtils from "jsonld-utils";
+import * as JsonLdUtils from "jsonld-utils";
 import Select from 'react-select';
 import {axiosBackend} from "../../actions";
 import PropTypes from "prop-types";

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,12 +5,12 @@
   "homepage": ".",
   "main": "js/index.js",
   "dependencies": {
-    "@kbss-cvut/s-forms": "0.7.1-alpha-bbdf088.0",
+    "@kbss-cvut/s-forms": "^0.7.1-alpha-261a6a4.0",
     "axios": "^0.21.1",
     "bowser": "^2.9.0",
     "classnames": "^2.3.1",
     "history": "^4.10.1",
-    "jsonld-utils": "https://kbss.felk.cvut.cz/dist/jsonld-utils-0.0.11.tgz",
+    "jsonld-utils": "https://kbss.felk.cvut.cz/dist/jsonld-utils-0.1.2.tgz",
     "lodash": "^4.17.15",
     "oidc-client": "^1.11.5",
     "platform": "^1.3.5",