Merge pull request #38 from eea/develop

fix: missing config, small ui improvements
eea · Dec 16, 2024 · 6048dd4 · 6048dd4
2 parents 4b02db7 + 4fecbf8
commit 6048dd4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,11 +4,13 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-### [3.1.1](https://github.com/eea/eionet2-dashboard/compare/3.1.0...3.1.1) - 13 December 2024
+### [3.1.2](https://github.com/eea/eionet2-dashboard/compare/3.1.1...3.1.2) - 16 December 2024
 
 #### :bug: Bug Fixes
 
-- fix: publications without date [Mihai Nicolae - [`db4854f`](https://github.com/eea/eionet2-dashboard/commit/db4854fd85daa83cbc9c2d03a294a36f0f99affb)]
+- fix: missing config, small ui improvements [Mihai Nicolae - [`5667719`](https://github.com/eea/eionet2-dashboard/commit/5667719ebcc7e75743a4cb55e840268a37e6d391)]
+
+### [3.1.1](https://github.com/eea/eionet2-dashboard/compare/3.1.0...3.1.1) - 13 December 2024
 
 ## [3.1.0](https://github.com/eea/eionet2-dashboard/compare/2.0.0...3.1.0) - 11 December 2024
 

diff --git a/env/.env.Prod_EEA b/env/.env.Prod_EEA
@@ -41,4 +41,5 @@ PROVISIONOUTPUT__SIMPLEAUTHOUTPUT__TEAMSFXPLUGINID=fx-resource-simple-auth
 PROVISIONOUTPUT__SIMPLEAUTHOUTPUT__ENDPOINT=https://eionet2dasprodf6d33esimpleauth.azurewebsites.net
 PROVISIONOUTPUT__SIMPLEAUTHOUTPUT__WEBAPPRESOURCEID=/subscriptions/2e921569-0c14-4082-ad47-bd65b64ec3d3/resourceGroups/eionet_user_management-Prod_EEA-rg/providers/Microsoft.Web/sites/eionet2dasprodf6d33esimpleAuth
 PROVISIONOUTPUT__FUNCTIONOUTPUT__TEAMSFXPLUGINID=fx-resource-function
-DOTNET_PATH=C:\Users\Hettich\.fx\bin\dotnet
+REACT_APP_INSIGHTS_CONNECTION=InstrumentationKey=f2f3c765-c89d-4110-9ed5-5640e4786298;IngestionEndpoint=https://westeurope-5.in.applicationinsights.azure.com/;LiveEndpoint=https://westeurope.livediagnostics.monitor.azure.com/;ApplicationId=66641215-8e6c-43fd-a976-4e86f7fc5450
+DOTNET_PATH=C:\Users\Nils EEA\.fx\bin\dotnet
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "eionet2-dashboard",
-    "version": "3.1.1",
+    "version": "3.1.2",
     "description": "",
     "author": "",
     "scripts": {
@@ -22,4 +22,4 @@
         "@fluentui/react-teams": "^6.0.0",
         "@mui/material": "^5.5.0"
     }
-}
+}
diff --git a/tabs/src/components/event_registration/EventExternalRegistration.jsx b/tabs/src/components/event_registration/EventExternalRegistration.jsx
@@ -18,6 +18,7 @@ import { useConfiguration } from '../../data/hooks/useConfiguration';
 import { postParticipant } from '../../data/sharepointProvider';
 import { getUserByMail } from '../../data/provider';
 import { validateMandatoryField, validateName } from '../../data/validator';
+import { HtmlBox } from '../HtmlBox';
 import validator from 'validator';
 
 export function EventExternalRegistration({ event, userInfo }) {
@@ -123,7 +124,7 @@ export function EventExternalRegistration({ event, userInfo }) {
         <CircularProgress color="primary" />
       </Backdrop>
       <Alert className="w95" sx={{ fontWeight: 'bold' }} severity="warning">
-        {configuration?.NFPInvitationInfoMessage}
+        <HtmlBox html={configuration?.NFPInvitationInfoMessage}></HtmlBox>
       </Alert>
       <Box className="row w95">
         <TextField
@@ -197,11 +198,9 @@ export function EventExternalRegistration({ event, userInfo }) {
         </Box>
       )}
       {errorText && (
-        <Box className="row w95">
-          <Alert sx={{ fontWeight: 'bold' }} severity="warning" className="note-label warning">
-            {errorText}
-          </Alert>
-        </Box>
+        <Alert className="w95" sx={{ fontWeight: 'bold' }} severity="error">
+          <HtmlBox html={errorText}></HtmlBox>
+        </Alert>
       )}
       <Box className="row w95" sx={{ marginTop: '1rem' }}>
         <Button
@@ -219,7 +218,7 @@ export function EventExternalRegistration({ event, userInfo }) {
       </Box>
       {successRegister && (
         <Alert className="w95" sx={{ fontWeight: 'bold' }} severity="info">
-          {configuration?.NFPInvitationSuccessMessage}
+          <HtmlBox html={configuration?.NFPInvitationSuccessMessage}></HtmlBox>
         </Alert>
       )}
     </Box>