Merge branch 'master' into pt-sem

sillsdev · Dec 18, 2024 · c31ab12 · c31ab12
2 parents b1a4c40 + e6eb771
commit c31ab12
Show file tree

Hide file tree

Showing 17 changed files with 248 additions and 42,697 deletions.
diff --git a/.env.local.template b/.env.local.template
diff --git a/README.md b/README.md
@@ -153,16 +153,9 @@ A rapid word collection tool. See the [User Guide](https://sillsdev.github.io/Th
    - `COMBINE_SMTP_ADDRESS`
    - `COMBINE_SMTP_FROM`
 
-2. _(Optional)_ To opt in to segment.com analytics to test the analytics during development:
+2. Run `npm start` from the project directory to install dependencies and start the project.
 
-   ```bash
-   # For Windows, use `copy`.
-   cp .env.local.template .env.local
-   ```
-
-3. Run `npm start` from the project directory to install dependencies and start the project.
-
-4. Consult our [C#](docs/style_guide/c_sharp_style_guide.md) and [TypeScript](docs/style_guide/ts_style_guide.md) style
+3. Consult our [C#](docs/style_guide/c_sharp_style_guide.md) and [TypeScript](docs/style_guide/ts_style_guide.md) style
    guides for best coding practices in this project.
 
 [chocolatey]: https://chocolatey.org/

diff --git a/deploy/helm/thecombine/charts/frontend/templates/deployment-frontend.yaml b/deploy/helm/thecombine/charts/frontend/templates/deployment-frontend.yaml
@@ -64,13 +64,6 @@ spec:
                 configMapKeyRef:
                   key: SERVER_NAME
                   name: env-frontend
-            {{- if .Values.configAnalyticsWriteKey }}
-            - name: CONFIG_ANALYTICS_WRITE_KEY
-              valueFrom:
-                configMapKeyRef:
-                  key: CONFIG_ANALYTICS_WRITE_KEY
-                  name: env-frontend
-            {{- end }}
           ports:
             - containerPort: 80
             - containerPort: 443

diff --git a/deploy/helm/thecombine/charts/frontend/templates/env-frontend-configmap.yaml b/deploy/helm/thecombine/charts/frontend/templates/env-frontend-configmap.yaml
@@ -13,6 +13,3 @@ data:
   CONFIG_OFFLINE: {{ .Values.configOffline | quote | lower }}
   CONFIG_EMAIL_ENABLED: {{ .Values.global.emailEnabled | quote | lower }}
   CONFIG_SHOW_CERT_EXPIRATION: {{ .Values.configShowCertExpiration | quote | lower }}
-  {{- if .Values.configAnalyticsWriteKey }}
-  CONFIG_ANALYTICS_WRITE_KEY: {{ .Values.configAnalyticsWriteKey | quote }}
-  {{- end }}
diff --git a/deploy/helm/thecombine/charts/frontend/values.yaml b/deploy/helm/thecombine/charts/frontend/values.yaml
@@ -22,7 +22,6 @@ imageName: combine_frontend
 
 # The additional domain list is a space-separated string list of domains
 combineAddlDomainList: ""
-configAnalyticsWriteKey: ""
 configCaptchaSiteKey: ""
 configOffline: false
 configShowCertExpiration: false
diff --git a/deploy/scripts/setup_files/profiles/prod.yaml b/deploy/scripts/setup_files/profiles/prod.yaml
@@ -13,7 +13,6 @@ charts:
       enabled: false
     # Frontend configuration items:
     frontend:
-      configAnalyticsWriteKey: "j9EeK4oURluRSIKbaXCBKBxGCnT2WahB"
       configCaptchaSiteKey: "0x4AAAAAAAiMciPlBW1aA1iL" # Turnstile site key
       configShowCertExpiration: false
     # Maintenance configuration items

diff --git a/deploy/scripts/setup_files/profiles/staging.yaml b/deploy/scripts/setup_files/profiles/staging.yaml
@@ -9,7 +9,6 @@ charts:
   thecombine:
     # Frontend configuration items:
     frontend:
-      configAnalyticsWriteKey: "AoebaDJNjSlOMRUH87EaNjvwkQpfLoyy"
       configCaptchaSiteKey: "0x4AAAAAAAiMciPlBW1aA1iL" # Turnstile site key
       configShowCertExpiration: false
     global:

diff --git a/docs/user_guide/assets/licenses/frontend_licenses.txt b/docs/user_guide/assets/licenses/frontend_licenses.txt
diff --git a/nginx/init/25-combine-runtime-config.sh b/nginx/init/25-combine-runtime-config.sh
@@ -51,7 +51,6 @@ env_map=(
   ["CONFIG_USE_CONNECTION_URL"]="useConnectionBaseUrlForApi"
   ["CONFIG_CAPTCHA_REQUIRED"]="captchaRequired"
   ["CONFIG_CAPTCHA_SITE_KEY"]="captchaSiteKey"
-  ["CONFIG_ANALYTICS_WRITE_KEY"]="analyticsWriteKey"
   ["CONFIG_OFFLINE"]="offline"
   ["CONFIG_EMAIL_ENABLED"]="emailServicesEnabled"
   ["CONFIG_SHOW_CERT_EXPIRATION"]="showCertExpiration"