Merge branch 'enh/archived-users-orgs' of https://github.com/yeatmanl…

…ab/roar-dashboard into enh/archived-users-orgs
yeatmanlab · Sep 24, 2024 · 5086d03 · 5086d03
2 parents 0ece276 + b0f9fd7
commit 5086d03
Show file tree

Hide file tree

Showing 19 changed files with 545 additions and 186 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1,4 @@
+# These owners will be the default owners for everything in the repo. Unless a
+# later match takes precedence, these owners will be requested for review when
+# someone opens a pull request.
+*       @yeatmanlab/roar-maintainers
diff --git a/.github/workflows/firebase-hosting-preview.yml b/.github/workflows/firebase-hosting-preview.yml
@@ -44,10 +44,6 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
-      # Inject the App Check Debug Token into the .env file at build time
-      - name: Create .env file with App Check Debug Token
-        run: echo "VITE_APPCHECK_DEBUG_TOKEN=${{ secrets.VITE_APPCHECK_DEBUG_TOKEN }}" >> .env
-
       - name: Build project
         run: npm run build
 

diff --git a/.github/workflows/firebase-hosting-production.yml b/.github/workflows/firebase-hosting-production.yml
@@ -30,6 +30,7 @@ jobs:
       PARTICIPANT_USERNAME: ${{ secrets.PARTICIPANT_USERNAME}}
       PARTICIPANT_PASSWORD: ${{ secrets.PARTICIPANT_PASSWORD }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      VITE_APPCHECK_DEBUG_TOKEN: ${{ secrets.VITE_APPCHECK_DEBUG_TOKEN }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -88,6 +89,7 @@ jobs:
       PARTICIPANT_USERNAME: ${{ secrets.PARTICIPANT_USERNAME}}
       PARTICIPANT_PASSWORD: ${{ secrets.PARTICIPANT_PASSWORD }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      VITE_APPCHECK_DEBUG_TOKEN: ${{ secrets.VITE_APPCHECK_DEBUG_TOKEN }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -126,6 +128,7 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 'lts/*'
+
       - name: 'vite production build'
         env:
           NODE_OPTIONS: '--max_old_space_size=8192'

diff --git a/.github/workflows/firebase-hosting-staging.yml b/.github/workflows/firebase-hosting-staging.yml
@@ -14,6 +14,7 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 'lts/*'
+
       - name: 'vite staging build'
         env:
           NODE_OPTIONS: '--max_old_space_size=8192'

diff --git a/firebase/admin/firestore.indexes.json b/firebase/admin/firestore.indexes.json
@@ -2998,6 +2998,10 @@
       "collectionGroup": "classes",
       "queryScope": "COLLECTION",
       "fields": [
+        {
+          "fieldPath": "archived",
+          "order": "ASCENDING"
+        },
         {
           "fieldPath": "schoolId",
           "order": "ASCENDING"
@@ -3012,6 +3016,10 @@
       "collectionGroup": "classes",
       "queryScope": "COLLECTION",
       "fields": [
+        {
+          "fieldPath": "archived",
+          "order": "ASCENDING"
+        },
         {
           "fieldPath": "schoolId",
           "order": "ASCENDING"
@@ -3022,10 +3030,70 @@
         }
       ]
     },
+    {
+      "collectionGroup": "classes",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "districtId",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "lastRoarSync",
+          "order": "ASCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "districts",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "archived",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "name",
+          "order": "ASCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "families",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "archived",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "name",
+          "order": "ASCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "groups",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "archived",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "name",
+          "order": "ASCENDING"
+        }
+      ]
+    },
     {
       "collectionGroup": "schools",
       "queryScope": "COLLECTION",
       "fields": [
+        {
+          "fieldPath": "archived",
+          "order": "ASCENDING"
+        },
         {
           "fieldPath": "districtId",
           "order": "ASCENDING"
@@ -3040,6 +3108,10 @@
       "collectionGroup": "schools",
       "queryScope": "COLLECTION",
       "fields": [
+        {
+          "fieldPath": "archived",
+          "order": "ASCENDING"
+        },
         {
           "fieldPath": "districtId",
           "order": "ASCENDING"
@@ -3054,6 +3126,10 @@
       "collectionGroup": "schools",
       "queryScope": "COLLECTION",
       "fields": [
+        {
+          "fieldPath": "archived",
+          "order": "ASCENDING"
+        },
         {
           "fieldPath": "districtId",
           "order": "ASCENDING"
@@ -3068,6 +3144,10 @@
       "collectionGroup": "schools",
       "queryScope": "COLLECTION",
       "fields": [
+        {
+          "fieldPath": "archived",
+          "order": "ASCENDING"
+        },
         {
           "fieldPath": "districtId",
           "order": "ASCENDING"
@@ -3082,6 +3162,10 @@
       "collectionGroup": "schools",
       "queryScope": "COLLECTION",
       "fields": [
+        {
+          "fieldPath": "archived",
+          "order": "ASCENDING"
+        },
         {
           "fieldPath": "districtId",
           "order": "ASCENDING"
@@ -3096,6 +3180,10 @@
       "collectionGroup": "schools",
       "queryScope": "COLLECTION",
       "fields": [
+        {
+          "fieldPath": "archived",
+          "order": "ASCENDING"
+        },
         {
           "fieldPath": "districtId",
           "order": "ASCENDING"
@@ -3106,6 +3194,20 @@
         }
       ]
     },
+    {
+      "collectionGroup": "schools",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "districtId",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "lastRoarSync",
+          "order": "ASCENDING"
+        }
+      ]
+    },
     {
       "collectionGroup": "users",
       "queryScope": "COLLECTION",
@@ -3352,6 +3454,20 @@
         }
       ]
     },
+    {
+      "collectionGroup": "users",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "districts.current",
+          "arrayConfig": "CONTAINS"
+        },
+        {
+          "fieldPath": "archived",
+          "order": "ASCENDING"
+        }
+      ]
+    },
     {
       "collectionGroup": "users",
       "queryScope": "COLLECTION",