Merge branch 'production' into develop

NBISweden · Jan 2, 2025 · 21a9e5e · 21a9e5e
2 parents 1377427 + f9a8554
commit 21a9e5e
Show file tree

Hide file tree

Showing 22 changed files with 386 additions and 57 deletions.
diff --git a/.docker/main b/.docker/main
@@ -13,12 +13,15 @@ FROM python:3.8-buster
 ENV TZ='Europe/Stockholm'
 RUN mkdir -p /code
 
-COPY app/ /code/
-WORKDIR /code
-
 RUN apt-get update && apt-get -y upgrade &&\
     apt-get install -y supervisor nginx inotify-tools rsync swig python3-pykcs11
 
+RUN usermod -u 1000 www-data
+RUN groupmod -g 1000 www-data
+
+COPY --chown=www-data:www-data app/ /code/
+WORKDIR /code
+
 RUN pip3 install -r /code/requirements.txt && chown -R www-data:www-data /code/
 RUN pip3 install uwsgi
 
@@ -37,4 +40,6 @@ COPY system/herdbook.standalone.nginx /etc/nginx/herdbook.standalone
 
 COPY system/entrypoint.sh /
 
+RUN chown -R www-data:www-data /code /api_src
+
 CMD /entrypoint.sh
diff --git a/app/herdbook.py b/app/herdbook.py
@@ -508,7 +508,10 @@ def external_login_handler(service):
 
     user = da.authenticate_with_credentials(service, persistent_id)
 
-    if user:
+    if user and not user.validated:
+        return "Du behöver gå en kurs och bli validerad först kontakta [email protected]"
+
+    if user and user.validated:
         APP.logger.info(
             "Logging in user %s (%s - #%d) by persistent id %s for service %s, refferrer is %s"
             % (
@@ -538,7 +541,7 @@ def external_login_handler(service):
         accountdetails["email"],
         None,
         username=accountdetails["username"],
-        validated=True,
+        validated=False,
         fullname=accountdetails["fullname"] if "fullname" in accountdetails else None,
         privileges=[
             {"level": "viewer", "genebank": 1},
@@ -567,9 +570,6 @@ def external_login_handler(service):
         % (persistent_id, accountdetails["email"], service)
     )
 
-    # FIXME: this is how we "really" log in the user
-    session["user_id"] = user.uuid
-
     # If we got a herd from external, setup ownership
     if "herd" in accountdetails:
         for h in ["G", "M"]:
@@ -586,9 +586,13 @@ def external_login_handler(service):
             else:
                 APP.logger.warning("Could not find herd id for herd %s" % h.strip())
 
-    login_user(user)
-
-    return redirect("/start")
+    # FIXME: this is how we "really" log in the user
+    if user.validated:
+        session["user_id"] = user.uuid
+        login_user(user)
+        return redirect("/start")
+    else:
+        return "Du behöver gå en kurs och bli validerad först kontakta [email protected]"
 
 
 @APP.route("/api/link/<string:service>", methods=["GET", "POST"])

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -48,6 +48,7 @@
     "react": "^17.0.2",
     "react-cookie-consent": "^8.0.1",
     "react-dom": "^17.0.2",
+    "react-hotjar": "^5.3.0",
     "react-icons": "^4.2.0",
     "react-is": "^17.0.2",
     "react-number-format": "^4.6.3",

diff --git a/frontend/src/breeding_form.tsx b/frontend/src/breeding_form.tsx
@@ -584,6 +584,11 @@ export function BreedingForm({
                     label="Född tidigast"
                     format={dateFormat}
                     value={fromDate}
+                    InputProps={{
+                      classes: {
+                        input: "data-hj-allow",
+                      },
+                    }}
                     InputLabelProps={{
                       shrink: true,
                     }}
@@ -661,6 +666,11 @@ export function BreedingForm({
               format={dateFormat}
               className="wideControl"
               value={formState.breed_date ?? null}
+              InputProps={{
+                classes: {
+                  input: "data-hj-allow",
+                },
+              }}
               InputLabelProps={{
                 shrink: true,
               }}
@@ -688,6 +698,12 @@ export function BreedingForm({
                   className="wideControl"
                   variant={inputVariant}
                   margin="normal"
+                  InputProps={{
+                    ...params.InputProps,
+                    classes: {
+                      input: "data-hj-allow",
+                    },
+                  }}
                 />
               )}
               // jscpd:ignore-end
@@ -716,6 +732,12 @@ export function BreedingForm({
                   className="wideControl"
                   variant={inputVariant}
                   margin="normal"
+                  InputProps={{
+                    ...params.InputProps,
+                    classes: {
+                      input: "data-hj-allow",
+                    },
+                  }}
                 />
               )}
               // jscpd:ignore-end
@@ -730,6 +752,7 @@ export function BreedingForm({
               className="wideControl"
               multiline
               minRows={2}
+              inputProps={{ className: "data-hj-allow" }}
               value={formState.breed_notes ?? ""}
               onChange={(e: any) => {
                 setFormField("breed_notes", e.target.value);
@@ -759,6 +782,11 @@ export function BreedingForm({
                   format={dateFormat}
                   className="controlFull"
                   value={formState.birth_date ?? null}
+                  InputProps={{
+                    classes: {
+                      input: "data-hj-allow",
+                    },
+                  }}
                   InputLabelProps={{
                     shrink: true,
                   }}
@@ -772,6 +800,7 @@ export function BreedingForm({
                     value={formState.litter_size ?? ""}
                     type="number"
                     className="control controlWidth"
+                    inputProps={{ className: "data-hj-allow" }}
                     variant={inputVariant}
                     InputLabelProps={{
                       shrink: true,
@@ -786,6 +815,7 @@ export function BreedingForm({
                     type="number"
                     className="controlWidth"
                     variant={inputVariant}
+                    inputProps={{ className: "data-hj-allow" }}
                     InputLabelProps={{
                       shrink: true,
                     }}
@@ -800,6 +830,7 @@ export function BreedingForm({
                   className="controlFull"
                   multiline
                   minRows={2}
+                  inputProps={{ className: "data-hj-allow" }}
                   value={formState.birth_notes ?? ""}
                   onChange={(e: any) => {
                     setFormField("birth_notes", e.target.value);

diff --git a/frontend/src/cert_autocomplete.tsx b/frontend/src/cert_autocomplete.tsx
@@ -74,6 +74,12 @@ export const CertAutocomplete = ({
             className="control"
             variant={inputVariant}
             margin="normal"
+            InputProps={{
+              ...params.InputProps,
+              classes: {
+                input: "data-hj-allow",
+              },
+            }}
           />
         )}
         onChange={(event: any, newValue: OptionType) => {
@@ -100,6 +106,7 @@ export const CertAutocomplete = ({
             className="control controlWidth"
             variant={inputVariant}
             value={individual.certificate ?? ""}
+            inputProps={{ className: "data-hj-allow" }}
             onChange={(event) => {
               updateIndividual("certificate", event.currentTarget.value);
             }}
@@ -122,6 +129,7 @@ export const CertAutocomplete = ({
             className="control controlWidth"
             variant={inputVariant}
             value={individual.digital_certificate ?? ""}
+            inputProps={{ className: "data-hj-allow" }}
             onChange={(event) => {
               updateIndividual(
                 "digital_certificate",
@@ -148,6 +156,7 @@ export const CertAutocomplete = ({
             label="Lägg till intyg senare"
             disabled
             className="control controlWidth"
+            inputProps={{ className: "data-hj-allow" }}
             variant={inputVariant}
             value=""
             onChange={() => {}}

diff --git a/frontend/src/filter_table.tsx b/frontend/src/filter_table.tsx
@@ -464,7 +464,17 @@ export function FilterTable({
             option.value == value.value
           }
           renderInput={(params) => (
-            <TextField {...params} variant={inputVariant} margin="normal" />
+            <TextField
+              {...params}
+              variant={inputVariant}
+              margin="normal"
+              InputProps={{
+                ...params.InputProps,
+                classes: {
+                  input: "data-hj-allow",
+                },
+              }}
+            />
           )}
           onChange={(event: any, newValues: OptionType[] | null) => {
             newValues && updateColumns(newValues);
@@ -521,6 +531,7 @@ export function FilterTable({
               className="search"
               label="Sök"
               variant={inputVariant}
+              inputProps={{ className: "data-hj-allow" }}
               onChange={(e) => setSearch(e.currentTarget.value)}
             />
             <TableContainer>

diff --git a/frontend/src/individual_add.tsx b/frontend/src/individual_add.tsx
@@ -862,6 +862,11 @@ export function IndividualAdd({
                       label="Född tidigast"
                       format={dateFormat}
                       value={fromDate}
+                      InputProps={{
+                        classes: {
+                          input: "data-hj-allow",
+                        },
+                      }}
                       InputLabelProps={{
                         shrink: true,
                       }}
@@ -895,6 +900,12 @@ export function IndividualAdd({
                   {...params}
                   label="Välj mor"
                   variant={inputVariant}
+                  InputProps={{
+                    ...params.InputProps,
+                    classes: {
+                      input: "data-hj-allow",
+                    },
+                  }}
                 />
               )}
             />
@@ -914,6 +925,12 @@ export function IndividualAdd({
                   {...params}
                   label="Välj far"
                   variant={inputVariant}
+                  InputProps={{
+                    ...params.InputProps,
+                    classes: {
+                      input: "data-hj-allow",
+                    },
+                  }}
                 />
               )}
             />

diff --git a/frontend/src/individual_breeding_form.tsx b/frontend/src/individual_breeding_form.tsx
@@ -422,6 +422,11 @@ export function IndividualBreedingForm({
                       label="Född tidigast"
                       format={dateFormat}
                       value={fromDate}
+                      InputProps={{
+                        classes: {
+                          input: "data-hj-allow",
+                        },
+                      }}
                       InputLabelProps={{
                         shrink: true,
                       }}
@@ -469,6 +474,12 @@ export function IndividualBreedingForm({
                       label="Välj mor"
                       variant={inputVariant}
                       className="controlFull"
+                      InputProps={{
+                        ...params.InputProps,
+                        classes: {
+                          input: "data-hj-allow",
+                        },
+                      }}
                     />
                   )}
                 />
@@ -498,6 +509,12 @@ export function IndividualBreedingForm({
                       label="Välj far"
                       variant={inputVariant}
                       className="controlFull"
+                      InputProps={{
+                        ...params.InputProps,
+                        classes: {
+                          input: "data-hj-allow",
+                        },
+                      }}
                     />
                   )}
                 />
@@ -515,6 +532,11 @@ export function IndividualBreedingForm({
                   format={dateFormat}
                   className="controlFull"
                   value={formState?.birth_date ?? null}
+                  InputProps={{
+                    classes: {
+                      input: "data-hj-allow",
+                    },
+                  }}
                   InputLabelProps={{
                     shrink: true,
                   }}
@@ -530,6 +552,11 @@ export function IndividualBreedingForm({
                   type="number"
                   className="control controlWidth"
                   variant={inputVariant}
+                  InputProps={{
+                    classes: {
+                      input: "data-hj-allow",
+                    },
+                  }}
                   InputLabelProps={{
                     shrink: true,
                   }}
@@ -543,6 +570,11 @@ export function IndividualBreedingForm({
                   type="number"
                   className="controlWidth"
                   variant={inputVariant}
+                  InputProps={{
+                    classes: {
+                      input: "data-hj-allow",
+                    },
+                  }}
                   InputLabelProps={{
                     shrink: true,
                   }}
@@ -562,6 +594,11 @@ export function IndividualBreedingForm({
                   onChange={(e: any) => {
                     setFormField("birth_notes", e.target.value);
                   }}
+                  InputProps={{
+                    classes: {
+                      input: "data-hj-allow",
+                    },
+                  }}
                 />
               </div>
             </div>