Merge branch 'master' into no-pii

sillsdev · Jan 17, 2025 · b50af39 · b50af39
2 parents 5a81d66 + 0b4e971
commit b50af39
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 15 deletions.
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -31,15 +31,13 @@ jobs:
             builds.dotnet.microsoft.com:443
             dc.services.visualstudio.com:443
             deb.debian.org:80
-            dotnetbuilds.azureedge.net:443
-            dotnetcli.azureedge.net:443
             github.com:443
             md-hdd-t032zjxllntc.z26.blob.storage.azure.net:443
             objects.githubusercontent.com:443
       - name: Checkout repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Setup dotnet
-        uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1
+        uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # v4.2.0
         with:
           dotnet-version: ${{ matrix.dotnet }}
       - name: Install ffmpeg
@@ -113,15 +111,14 @@ jobs:
             api.nuget.org:443
             builds.dotnet.microsoft.com:443
             dc.services.visualstudio.com:443
-            dotnetcli.azureedge.net:443
             github.com:443
             objects.githubusercontent.com:443
       - name: Checkout repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       # Manually install .NET to work around:
       # https://github.com/github/codeql-action/issues/757
       - name: Setup .NET
-        uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1
+        uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # v4.2.0
         with:
           dotnet-version: "8.0.x"
       - name: Initialize CodeQL

diff --git a/.github/workflows/deploy_qa.yml b/.github/workflows/deploy_qa.yml
@@ -34,11 +34,9 @@ jobs:
             api.nuget.org:443
             archive.ubuntu.com:80
             auth.docker.io:443
-            codecov.io:443
             dc.services.visualstudio.com:443
             deb.debian.org:80
             docker.io:443
-            dotnetcli.azureedge.net:443
             files.pythonhosted.org:443
             github.com:443
             mcr.microsoft.com:443
@@ -51,7 +49,6 @@ jobs:
             security.ubuntu.com:80
             storage.googleapis.com:443
             sts.${{ secrets.AWS_DEFAULT_REGION }}.amazonaws.com:443
-            uploader.codecov.io:443
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           fetch-depth: 0

diff --git a/.github/workflows/deploy_release.yml b/.github/workflows/deploy_release.yml
@@ -27,15 +27,14 @@ jobs:
             *.actions.githubusercontent.com:443
             *.cloudfront.net:443
             *.data.mcr.microsoft.com:443
-            api.ecr-public.us-east-1.amazonaws.com:443
+            api.ecr-public.${{ secrets.AWS_DEFAULT_REGION }}.amazonaws.com:443
             api.github.com:443
             api.nuget.org:443
             archive.ubuntu.com:80
             auth.docker.io:443
             dc.services.visualstudio.com:443
             deb.debian.org:80
             docker.io:443
-            dotnetcli.azureedge.net:443
             files.pythonhosted.org:443
             github.com:443
             mcr.microsoft.com:443
@@ -47,7 +46,7 @@ jobs:
             security.debian.org:80
             security.ubuntu.com:80
             storage.googleapis.com:443
-            sts.us-east-1.amazonaws.com:443
+            sts.${{ secrets.AWS_DEFAULT_REGION }}.amazonaws.com:443
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Build The Combine
         id: build_combine

diff --git a/src/types/goals.ts b/src/types/goals.ts
@@ -1,6 +1,5 @@
 import { v4 } from "uuid";
 
-import { type User } from "api/models";
 import {
   type CharInvChanges,
   type CharInvData,
@@ -12,7 +11,6 @@ import {
   type MergesCompleted,
 } from "goals/MergeDuplicates/MergeDupsTypes";
 import { type EntriesEdited } from "goals/ReviewEntries/ReviewEntriesTypes";
-import { newUser } from "types/user";
 
 export type GoalData = CharInvData | MergeDupsData;
 // Record<string, never> is the recommended type for an empty object.
@@ -61,7 +59,6 @@ export class Goal {
   guid: string;
   goalType: GoalType;
   name: GoalName;
-  user: User;
   steps: GoalStep[];
   numSteps: number;
   currentStep: number;
@@ -78,7 +75,6 @@ export class Goal {
     this.guid = v4();
     this.goalType = type;
     this.name = name;
-    this.user = newUser();
     this.steps = steps;
     this.numSteps = 1;
     this.currentStep = 0;