Upstream sync 1

package.json

@@ -40,6 +40,7 @@
     "@bdelab/roav-crowding": "1.1.11",
     "@bdelab/roav-mep": "^1.1.16",
     "@bdelab/roav-ran": "^1.0.21",
+    "@levante-framework/core-tasks": "^1.0.0-beta.16",
     "@sentry/browser": "^8.0.0",
     "@sentry/integrations": "^7.114.0",
     "@sentry/vite-plugin": "^2.16.1",
@@ -54,7 +55,6 @@
     "axios": "^1.5.1",
     "buffer": "^6.0.3",
     "chart.js": "^4.3.3",
-    "core-tasks": "^1.0.0-beta.12",
     "dotenv": "^16.3.1",
     "html2canvas": "^1.4.1",
     "jspdf": "^2.5.1",

src/components/ParticipantSidebar.vue

@@ -7,7 +7,7 @@
         <p>{{ $t('participantSidebar.tasksCompleted') }}</p>
       </div>
     </div>
-    <ul v-if="!!studentInfo" class="sidebar-info">
+    <ul v-if="!_isEmpty(studentInfo)" class="sidebar-info">
       <li class="sidebar-title">
         <strong>{{ $t('participantSidebar.studentInfo') }}</strong>
       </li>
@@ -19,6 +19,7 @@
 </template>
 <script setup>
 import { ref, computed } from 'vue';
+import _isEmpty from 'lodash/isEmpty';
 
 const props = defineProps({
   totalGames: { type: Number, required: true, default: 0 },

src/components/tasks/TaskLevante.vue

@@ -24,7 +24,7 @@ const props = defineProps({
 let levanteTaskLauncher;
 
 const taskId = props.taskId;
-const { version } = packageLockJson.packages['node_modules/core-tasks'];
+const { version } = packageLockJson.packages['node_modules/@levante-framework/core-tasks'];
 const router = useRouter();
 const gameStarted = ref(false);
 const authStore = useAuthStore();
@@ -65,7 +65,7 @@ window.addEventListener(
 
 onMounted(async () => {
   try {
-    let module = await import('core-tasks');
+    let module = await import('@levante-framework/core-tasks');
     levanteTaskLauncher = module.TaskLauncher;
   } catch (error) {
     console.error('An error occurred while importing the game module.', error);
@@ -131,7 +131,7 @@ async function startTask() {
 </script>
 
 <style>
-@import 'core-tasks/lib/resources/core-tasks.css';
+@import '@levante-framework/core-tasks/lib/resources/core-tasks.css';
 
 .game-target {
   position: absolute;

src/helpers/query/utils.js

@@ -189,29 +189,28 @@ export const matchMode2Op = {
 };
 
 export const fetchSubcollection = async (collectionPath, subcollectionName, select = [], db = 'admin') => {
-  const axiosInstance = getAxiosInstance(db);
-  // Construct the path to the subcollection
-  const subcollectionPath = `/${collectionPath}/${subcollectionName}`;
-  const queryParams = select.map((field) => `mask.fieldPaths=${field}`).join('&');
-  const queryString = queryParams ? `?${queryParams}` : '';
+  try {
+    const axiosInstance = getAxiosInstance(db);
+    const subcollectionPath = `/${collectionPath}/${subcollectionName}`;
 
-  return axiosInstance
-    .get(subcollectionPath + queryString)
-    .then(({ data }) => {
-      // Assuming the API returns an array of document data in the subcollection
-      return data.documents
-        ? data.documents.map((doc) => {
-            return {
-              id: doc.name.split('/').pop(), // Extract document ID from the document name/path
-              ..._mapValues(doc.fields, (value) => convertValues(value)),
-            };
-          })
-        : [];
-    })
-    .catch((error) => {
-      console.error(error);
-      return {
-        error: `${error.response?.status === 404 ? 'Subcollection not found' : error.message}`,
-      };
-    });
+    // Build query string for selected fields
+    const queryParams = select.map((field) => `mask.fieldPaths=${field}`).join('&');
+    const queryString = queryParams ? `?${queryParams}` : '';
+
+    const response = await axiosInstance.get(subcollectionPath + queryString);
+
+    // Check if the API returns an array of document data in the subcollection
+    const documents = response.data.documents || [];
+
+    // Map and return the documents with the required format
+    return documents.map((doc) => ({
+      id: doc.name.split('/').pop(), // Extract document ID from the document name/path
+      ..._mapValues(doc.fields, (value) => convertValues(value)),
+    }));
+  } catch (error) {
+    console.error('Failed to fetch subcollection: ', error);
+    return {
+      error: error.response?.status === 404 ? 'Subcollection not found' : error.message,
+    };
+  }
 };