Merge branch 'main' into enh/consent-picker

cypress/e2e/participant/default-tests/playVocab.cy.js

@@ -2,8 +2,8 @@ import { playVocabulary } from '../../../support/helper-functions/roar-vocab/voc
 import { isCurrentVersion } from '../../../support/utils';
 
 const app = '@bdelab/roar-vocab';
-describe('ROAR - Written Vocabulary Play Through', () => {
-  it('Plays Written Vocabulary', () => {
+describe('ROAR - Vocabulary Play Through', () => {
+  it('Plays Vocabulary', () => {
     cy.wrap(isCurrentVersion(app)).then((isCurrentVersion) => {
       if (isCurrentVersion) {
         cy.log(`Did not detect a new version of ${app}, skipping test.`);

cypress/e2e/partner-admin/default-tests/exportSelectedScoreReport.cy.js

@@ -13,6 +13,8 @@ describe('The partner admin can select and export progress reports for a given a
     cy.get('.p-checkbox-box').first().click();
 
     cy.get('button').contains('Export Selected').click();
-    cy.readFile(`${Cypress.env('cypressDownloads')}/roar-scores-selected.csv`);
+    cy.readFile(
+      `${Cypress.env('cypressDownloads')}/roar-scores-partner-test-administration-cypress-test-district-selected.csv`,
+    );
   });
 });

cypress/support/commands.js

@@ -94,18 +94,18 @@ Cypress.Commands.add(
 );
 
 Cypress.Commands.add('activateAdminSidebar', () => {
-  cy.get('[data-cy="button-admin-sidebar"]').click().wait(1000);
+  cy.get('[data-cy="button-admin-sidebar"]').click();
+  cy.wait(1000);
 });
 
 Cypress.Commands.add('selectAdministration', (testAdministration) => {
-  cy.get('[data-cy="dropdown-select-administration"]', { timeout: 2 * Cypress.env('timeout') })
-    .should('exist')
-    .click();
-  cy.get('.p-dropdown-item', { timeout: 2 * Cypress.env('timeout') })
-    .contains(testAdministration)
-    .should('exist')
-    .click();
-  cy.log('Selected administration:', testAdministration);
+  cy.then(() => {
+    cy.get('[data-cy="dropdown-select-administration"]', { timeout: 2 * Cypress.env('timeout') }).click();
+    cy.get('.p-dropdown-item', { timeout: 2 * Cypress.env('timeout') })
+      .contains(testAdministration)
+      .click();
+    cy.log('Selected administration:', testAdministration);
+  });
 });
 
 Cypress.Commands.add('getAdministrationCard', (testAdministration) => {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "roar-dashboard",
   "private": true,
-  "version": "2.7.0",
+  "version": "2.7.1",
   "scripts": {
     "build": "export VITE_FIREBASE_DATA_SOURCE=live && vite build",
     "build:sandbox": "export VITE_FIREBASE_DATA_SOURCE=sandbox && vite build",
@@ -31,13 +31,13 @@
     "@bdelab/roar-firekit": "^6.0.1",
     "@bdelab/roar-letter": "^1.11.4",
     "@bdelab/roar-multichoice": "^1.11.3",
-    "@bdelab/roar-pa": "^2.2.0",
-    "@bdelab/roar-sre": "^1.15.1",
+    "@bdelab/roar-pa": "^2.2.3",
+    "@bdelab/roar-sre": "^1.15.8",
     "@bdelab/roar-swr": "^1.12.1",
     "@bdelab/roar-utils": "^1.2.1",
-    "@bdelab/roar-vocab": "^1.7.2",
-    "@bdelab/roav-crowding": "^1.1.0",
-    "@bdelab/roav-ran": "^1.0.14",
+    "@bdelab/roar-vocab": "^1.8.0",
+    "@bdelab/roav-crowding": "^1.1.10",
+    "@bdelab/roav-ran": "^1.0.16",
     "@sentry/browser": "^8.0.0",
     "@sentry/integrations": "^7.114.0",
     "@sentry/vite-plugin": "^2.16.1",
@@ -51,7 +51,7 @@
     "axios": "^1.5.1",
     "buffer": "^6.0.3",
     "chart.js": "^4.3.3",
-    "core-tasks": "^1.0.0-beta.9",
+    "core-tasks": "^1.0.0-beta.12",
     "dotenv": "^16.3.1",
     "html2canvas": "^1.4.1",
     "jspdf": "^2.5.1",
@@ -85,7 +85,7 @@
     "@types/lodash": "^4.14.196",
     "@vitejs/plugin-basic-ssl": "^1.0.1",
     "@vitejs/plugin-vue": "^4.0.0",
-    "cypress": "^13.6.3",
+    "cypress": "^13.10.0",
     "eslint": "^8.53.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-cypress": "^2.15.1",

src/components/CardAdministration.vue

@@ -156,7 +156,7 @@ import { setBarChartData, setBarChartOptions } from '@/helpers/plotting';
 const router = useRouter();
 
 const authStore = useAuthStore();
-const { roarfirekit, administrationQueryKeyIndex } = storeToRefs(authStore);
+const { roarfirekit, administrationQueryKeyIndex, uid } = storeToRefs(authStore);
 
 const props = defineProps({
   id: { type: String, required: true },
@@ -390,7 +390,7 @@ const fetchTreeOrgs = async () => {
 };
 
 const { data: orgs, isLoading: loadingDsgfOrgs } = useQuery({
-  queryKey: ['dsgfOrgs', authStore.uid, props.id],
+  queryKey: ['dsgfOrgs', uid, props.id],
   queryFn: () => fetchTreeOrgs(),
   keepPreviousData: true,
   staleTime: 5 * 60 * 1000, // 5 minutes