Add archived: false to queries for users and orgs

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",

src/components/ListUsers.vue

@@ -222,6 +222,12 @@ const columns = ref([
     dataType: 'string',
     sort: false,
   },
+  {
+    field: 'archived',
+    header: 'Archived',
+    dataType: 'boolean',
+    sort: false,
+  },
   {
     header: 'Edit',
     button: true,

src/helpers/query/assignments.js

@@ -173,90 +173,6 @@ export const getAssignmentsRequestBody = ({
   return requestBody;
 };
 
-export const getUsersByAssignmentIdRequestBody = ({
-  adminId,
-  orgType,
-  orgId,
-  filter,
-  aggregationQuery,
-  pageLimit,
-  page,
-  paginate = true,
-  select = userSelectFields,
-}) => {
-  const requestBody = {
-    structuredQuery: {},
-  };
-
-  if (!aggregationQuery) {
-    if (paginate) {
-      requestBody.structuredQuery.limit = pageLimit;
-      requestBody.structuredQuery.offset = page * pageLimit;
-    }
-
-    if (select.length > 0) {
-      requestBody.structuredQuery.select = {
-        fields: select.map((field) => ({ fieldPath: field })),
-      };
-    }
-  }
-
-  requestBody.structuredQuery.from = [
-    {
-      collectionId: 'users',
-      allDescendants: false,
-    },
-  ];
-
-  requestBody.structuredQuery.where = {
-    compositeFilter: {
-      op: 'AND',
-      filters: [
-        {
-          fieldFilter: {
-            field: { fieldPath: `${pluralizeFirestoreCollection(orgType)}.current` },
-            op: 'ARRAY_CONTAINS',
-            value: { stringValue: orgId },
-          },
-        },
-        {
-          fieldFilter: {
-            field: { fieldPath: `assignments.assigned` },
-            op: 'ARRAY_CONTAINS_ANY',
-            value: { arrayValue: { values: [{ stringValue: adminId }] } },
-          },
-        },
-      ],
-    },
-  };
-
-  if (filter) {
-    requestBody.structuredQuery.where.compositeFilter.filters.push({
-      fieldFilter: {
-        field: { fieldPath: filter[0].field },
-        op: 'EQUAL',
-        value: { stringValue: filter[0].value },
-      },
-    });
-  }
-
-  if (aggregationQuery) {
-    return {
-      structuredAggregationQuery: {
-        ...requestBody,
-        aggregations: [
-          {
-            alias: 'count',
-            count: {},
-          },
-        ],
-      },
-    };
-  }
-
-  return requestBody;
-};
-
 export const getFilteredScoresRequestBody = ({
   adminId,
   orgId,