Merge pull request #517 from datagov-cz/issue-al-174

Issue AL-174

.env

@@ -5,3 +5,4 @@ REACT_APP_COMPONENTS=YWwtc2dvdi1zZXJ2ZXI6CiAgbmFtZTogU0dvViBTZXJ2aWNlCiAgdXJsOiB
 BROWSER=none
 REACT_APP_DEBUG=false
 REACT_APP_AUTHENTICATION=true
+REACT_APP_TERM_LANGUAGE=cs

src/components/modals/CreationModals.tsx

@@ -89,7 +89,6 @@ export const CreationModals: React.FC<Props> = (props) => {
         }}
       />
       <NewElemModal
-        projectLanguage={props.projectLanguage}
         modal={modalAddElem}
         configuration={props.elemConfiguration}
         close={(

src/components/modals/NewElemForm.tsx

@@ -19,9 +19,9 @@ import classNames from "classnames";
 import { Flags } from "../LanguageSelector";
 import * as _ from "lodash";
 import { ListLanguageControls } from "../../panels/detail/components/items/ListLanguageControls";
+import { Environment } from "../../config/Environment";
 
 interface Props {
-  projectLanguage: string;
   termName: LanguageObject;
   selectedVocabulary: string;
   errorText: string;
@@ -34,7 +34,7 @@ export const NewElemForm: React.FC<Props> = (props) => {
   const [activatedInputs, setActivatedInputs] = useState<string[]>([]);
 
   useEffect(() => {
-    setActivatedInputs([AppSettings.canvasLanguage]);
+    setActivatedInputs([Environment.language]);
   }, []);
 
   const checkExists: (scheme: string, name: string) => boolean = (
@@ -68,7 +68,7 @@ export const NewElemForm: React.FC<Props> = (props) => {
     names: ReturnType<typeof initLanguageObject>
   ) => {
     let errorText = "";
-    if (names[AppSettings.canvasLanguage] === "") {
+    if (names[Environment.language] === "") {
       errorText = Locale[AppSettings.interfaceLanguage].modalNewElemError;
     } else if (Object.values(names).find((name) => checkExists(scheme, name))) {
       errorText = Locale[AppSettings.interfaceLanguage].modalNewElemExistsError;
@@ -79,7 +79,7 @@ export const NewElemForm: React.FC<Props> = (props) => {
     ) {
       errorText = Locale[AppSettings.interfaceLanguage].modalNewElemLengthError;
     } else if (
-      createNewElemIRI(scheme, names[AppSettings.canvasLanguage]) ===
+      createNewElemIRI(scheme, names[Environment.language]) ===
       WorkspaceVocabularies[getVocabularyFromScheme(scheme)].namespace
     ) {
       errorText =
@@ -118,7 +118,7 @@ export const NewElemForm: React.FC<Props> = (props) => {
               src={`https://purecatamphetamine.github.io/country-flag-icons/3x2/${Flags[lang]}.svg`}
               alt={Languages[lang]}
             />
-            {lang === AppSettings.canvasLanguage ? "*" : ""}
+            {lang === Environment.language && <strong>*</strong>}
           </InputGroup.Text>
           <Form.Control
             value={props.termName[lang]}
@@ -175,7 +175,7 @@ export const NewElemForm: React.FC<Props> = (props) => {
               <option key={i} value={vocab}>
                 {getLabelOrBlank(
                   WorkspaceVocabularies[vocab].labels,
-                  props.projectLanguage
+                  AppSettings.canvasLanguage
                 )}
               </option>
             ))}
@@ -188,7 +188,7 @@ export const NewElemForm: React.FC<Props> = (props) => {
         }
 					${createNewElemIRI(
             WorkspaceVocabularies[props.selectedVocabulary].glossary,
-            props.termName[AppSettings.interfaceLanguage]
+            props.termName[Environment.language]
           )}`}</Alert>
       )}
       {props.errorText && <Alert variant="danger">{props.errorText}</Alert>}

src/components/modals/NewElemModal.tsx

@@ -6,11 +6,11 @@ import { ElemCreationConfiguration } from "./CreationModals";
 import { initLanguageObject } from "../../function/FunctionEditVars";
 import { Locale } from "../../config/Locale";
 import { NewElemForm } from "./NewElemForm";
+import { Environment } from "../../config/Environment";
 
 interface Props {
   modal: boolean;
   close: (names?: State["termName"], vocabulary?: string) => void;
-  projectLanguage: string;
   configuration: ElemCreationConfiguration;
 }
 
@@ -76,7 +76,7 @@ export default class NewElemModal extends React.Component<Props, State> {
                 Locale[AppSettings.interfaceLanguage].modalNewElemError,
             });
           const input = document.getElementById(
-            "newElemLabelInput" + this.props.projectLanguage
+            "newElemLabelInput" + Environment.language
           );
           if (input) input.focus();
         }}
@@ -93,7 +93,6 @@ export default class NewElemModal extends React.Component<Props, State> {
           <Modal.Body>
             {this.state.selectedVocabulary && (
               <NewElemForm
-                projectLanguage={this.props.projectLanguage}
                 termName={this.state.termName}
                 selectedVocabulary={this.state.selectedVocabulary}
                 errorText={this.state.errorText}

src/components/modals/NewLinkModal.tsx

@@ -250,7 +250,6 @@ export default class NewLinkModal extends React.Component<Props, State> {
               />
               {this.state.create && (
                 <NewElemForm
-                  projectLanguage={this.props.projectLanguage}
                   termName={this.state.termName}
                   selectedVocabulary={this.state.selectedVocabulary}
                   errorText={this.state.errorText}

src/config/Environment.ts

@@ -4,7 +4,11 @@ import {
 } from "@opendata-mvcr/assembly-line-shared";
 import { Components } from "@opendata-mvcr/assembly-line-shared/dist/env/types";
 
-type LocalVars = "PUBLIC_URL" | "AUTHENTICATION" | "DEBUG_DATA";
+type LocalVars =
+  | "PUBLIC_URL"
+  | "AUTHENTICATION"
+  | "DEBUG_DATA"
+  | "TERM_LANGUAGE";
 
 setProcessEnv(process.env);
 const ENV = getEnvInstance<LocalVars>();
@@ -22,11 +26,14 @@ export const Environment: {
   auth: boolean;
   // Load local debug data instead of fetching off a DB
   debug: boolean;
+  // Default language
+  language: string;
 } = {
   components: ENV.getComponents(),
   context: ENV.get("CONTEXT"),
   id: ENV.get("ID"),
   url: ENV.get("URL"),
   auth: ENV.get("AUTHENTICATION", "true") === "true",
   debug: ENV.get("DEBUG", "true") === "true",
+  language: ENV.get("TERM_LANGUAGE"),
 };

src/interface/ContextInterface.tsx

@@ -8,6 +8,7 @@ import { StoreSettings } from "../config/Store";
 import {
   AppSettings,
   Diagrams,
+  Languages,
   Links,
   WorkspaceElements,
   WorkspaceLinks,
@@ -51,8 +52,13 @@ import {
   updateProjectLinkParallel,
 } from "../queries/update/UpdateLinkQueries";
 import { processQuery, processTransaction } from "./TransactionInterface";
+import { Environment } from "../config/Environment";
 
 export function retrieveInfoFromURLParameters(): boolean {
+  if (!(Environment.language in Languages))
+    throw new Error(
+      "TERM_LANGUAGE environment variable is not listed in the Languages.ts object."
+    );
   const isURL = require("is-url");
   const urlParams = new URLSearchParams(window.location.search);
   const URIContexts = urlParams.getAll("vocabulary");