Set an analytics prop on User based on analytics consent state

sillsdev · Dec 4, 2024 · 9e14a13 · 9e14a13
1 parent 55384c3
commit 9e14a13
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/Backend/Models/User.cs b/Backend/Models/User.cs
@@ -66,6 +66,9 @@ public class User
         [BsonElement("username")]
         public string Username { get; set; }
 
+        [BsonElement("otelConsent")]
+        public bool OtelConsent { get; set; }
+
         [BsonElement("uiLang")]
         public string UILang { get; set; }
 
@@ -97,6 +100,7 @@ public User()
             Agreement = false;
             Password = "";
             Username = "";
+            OtelConsent = false;
             UILang = "";
             GlossSuggestion = AutocompleteSetting.On;
             Token = "";
@@ -119,6 +123,7 @@ public User Clone()
                 Agreement = Agreement,
                 Password = Password,
                 Username = Username,
+                OtelConsent = OtelConsent,
                 UILang = UILang,
                 GlossSuggestion = GlossSuggestion,
                 Token = Token,
@@ -141,6 +146,7 @@ public bool ContentEquals(User other)
                 other.Agreement == Agreement &&
                 other.Password.Equals(Password, StringComparison.Ordinal) &&
                 other.Username.Equals(Username, StringComparison.Ordinal) &&
+                other.OtelConsent == OtelConsent &&
                 other.UILang.Equals(UILang, StringComparison.Ordinal) &&
                 other.GlossSuggestion.Equals(GlossSuggestion) &&
                 other.Token.Equals(Token, StringComparison.Ordinal) &&
@@ -178,6 +184,7 @@ public override int GetHashCode()
             hash.Add(Agreement);
             hash.Add(Password);
             hash.Add(Username);
+            hash.Add(OtelConsent);
             hash.Add(UILang);
             hash.Add(GlossSuggestion);
             hash.Add(Token);

diff --git a/Backend/Repositories/UserRepository.cs b/Backend/Repositories/UserRepository.cs
@@ -196,6 +196,7 @@ public async Task<ResultOfUpdate> Update(string userId, User user, bool updateIs
                 .Set(x => x.ProjectRoles, user.ProjectRoles)
                 .Set(x => x.Agreement, user.Agreement)
                 .Set(x => x.Username, user.Username)
+                .Set(x => x.OtelConsent, user.OtelConsent)
                 .Set(x => x.UILang, user.UILang)
                 .Set(x => x.GlossSuggestion, user.GlossSuggestion);
 

diff --git a/src/api/models/user.ts b/src/api/models/user.ts
@@ -92,6 +92,12 @@ export interface User {
    * @memberof User
    */
   username: string;
+  /**
+   *
+   * @type {boolean}
+   * @memberof User
+   */
+  otelConsent?: boolean;
   /**
    *
    * @type {string}
@@ -100,20 +106,20 @@ export interface User {
   uiLang?: string | null;
   /**
    *
-   * @type {string}
+   * @type {AutocompleteSetting}
    * @memberof User
    */
-  token: string;
+  glossSuggestion: AutocompleteSetting;
   /**
    *
-   * @type {boolean}
+   * @type {string}
    * @memberof User
    */
-  isAdmin: boolean;
+  token: string;
   /**
    *
-   * @type {AutocompleteSetting}
+   * @type {boolean}
    * @memberof User
    */
-  glossSuggestion: AutocompleteSetting;
+  isAdmin: boolean;
 }
diff --git a/src/components/UserSettings/UserSettings.tsx b/src/components/UserSettings/UserSettings.tsx
@@ -11,7 +11,7 @@ import {
   Typography,
 } from "@mui/material";
 import { enqueueSnackbar } from "notistack";
-import { FormEvent, Fragment, ReactElement, useState } from "react";
+import { FormEvent, Fragment, ReactElement, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { show } from "vanilla-cookieconsent";
 
@@ -65,6 +65,7 @@ export function UserSettings(props: {
   const [name, setName] = useState(props.user.name);
   const [phone, setPhone] = useState(props.user.phone);
   const [email, setEmail] = useState(props.user.email);
+  const [otelConsent, setOtelConsent] = useState(analyticsConsent);
   const [uiLang, setUiLang] = useState(props.user.uiLang ?? "");
   const [glossSuggestion, setGlossSuggestion] = useState(
     props.user.glossSuggestion
@@ -80,10 +81,15 @@ export function UserSettings(props: {
     return unchanged || !(await isEmailTaken(unicodeEmail));
   }
 
+  useEffect(() => {
+    setOtelConsent(analyticsConsent);
+  }, [analyticsConsent]);
+
   const disabled =
     name === props.user.name &&
     phone === props.user.phone &&
     punycode.toUnicode(email) === props.user.email &&
+    otelConsent === props.user.otelConsent &&
     uiLang === (props.user.uiLang ?? "") &&
     glossSuggestion === props.user.glossSuggestion;
 
@@ -95,6 +101,7 @@ export function UserSettings(props: {
         name,
         phone,
         email: punycode.toUnicode(email),
+        otelConsent,
         uiLang,
         glossSuggestion,
         hasAvatar: !!avatar,