Merge branch 'master' into build-improvement

src/components/DataExportSection.vue

@@ -54,7 +54,10 @@ messages * - Conditional UI based on platform capabilities * * @component *
 
 <script lang="ts">
 import { Component, Prop, Vue } from "vue-facing-decorator";
+import * as R from "ramda";
+
 import { AppString, NotificationIface } from "../constants/app";
+import { Contact } from "../db/tables/contacts";
 
 import { logger } from "../utils/logger";
 import { contactsToExportJson } from "../libs/util";
@@ -175,11 +178,21 @@ export default class DataExportSection extends Vue {
     try {
       this.isExporting = true;
 
-      // Fetch contacts from database using mixin's cached method
-      const allContacts = await this.$contacts();
+      // Fetch contacts from database using database utility
+      const allContacts = await this.$databaseUtil.getContacts();
 
       // Convert contacts to export format
-      const exportData = contactsToExportJson(allContacts);
+      const processedContacts: Contact[] = allContacts.map((contact) => {
+        // first remove the contactMethods field, mostly to cast to a clear type (that will end up with JSON objects)
+        const exContact: Contact = R.omit(["contactMethods"], contact);
+        // now add contactMethods as a true array of ContactMethod objects
+        exContact.contactMethods = contact.contactMethods
+          ? JSON.parse(contact.contactMethods as string)
+          : undefined;
+        return exContact;
+      });
+
+      const exportData = contactsToExportJson(processedContacts);
       const jsonStr = JSON.stringify(exportData, null, 2);
 
       // Use platform service to handle export (no platform-specific logic here!)

src/interfaces/deepLinks.ts

@@ -33,7 +33,6 @@ export const deepLinkSchemas = {
     id: z.string(),
   }),
   "claim-add-raw": z.object({
-    id: z.string(),
     claim: z.string().optional(),
     claimJwtId: z.string().optional(),
   }),

src/libs/util.ts

@@ -893,7 +893,7 @@ export interface DatabaseExport {
 }
 
 /**
- * Converts an array of contacts to the standardized database export JSON format.
+ * Converts an array of contacts to the export JSON format.
  * This format is used for data migration and backup purposes.
  *
  * @param contacts - Array of Contact objects to convert

src/services/deepLinks.ts

@@ -149,6 +149,10 @@ export class DeepLinkHandler {
       params[routeConfig.paramKey ?? "id"] = pathParams.join("/");
     }
 
+    // logConsoleAndDb(
+    //   `[DeepLink] Debug: Route Path: ${routePath} Path Params: ${JSON.stringify(params)} Query String: ${JSON.stringify(query)}`,
+    //   false,
+    // );
     return { path: routePath, params, query };
   }
 
@@ -195,14 +199,14 @@ export class DeepLinkHandler {
     // Continue with parameter validation as before...
     const schema = deepLinkSchemas[path as keyof typeof deepLinkSchemas];
 
-    let validatedParams, validatedQuery;
+    let validatedParams;
     try {
       validatedParams = await schema.parseAsync(params);
-      validatedQuery = await schema.parseAsync(query);
     } catch (error) {
       // For parameter validation errors, provide specific error feedback
-      console.error(
+      logConsoleAndDb(
         `[DeepLink] Invalid parameters for route name ${routeName} for path: ${path}: ${JSON.stringify(error)} ... with params: ${JSON.stringify(params)} ... and query: ${JSON.stringify(query)}`,
+        true,
       );
       await this.router.replace({
         name: "deep-link-error",
@@ -223,11 +227,11 @@ export class DeepLinkHandler {
       await this.router.replace({
         name: routeName,
         params: validatedParams,
-        query: validatedQuery,
       });
     } catch (error) {
-      console.error(
-        `[DeepLink] Error routing to route name ${routeName} for path: ${path}: ${JSON.stringify(error)} ... with validated params: ${JSON.stringify(validatedParams)} ... and validated query: ${JSON.stringify(validatedQuery)}`,
+      logConsoleAndDb(
+        `[DeepLink] Error routing to route name ${routeName} for path: ${path}: ${JSON.stringify(error)} ... with validated params: ${JSON.stringify(validatedParams)}`,
+        true,
       );
       // For parameter validation errors, provide specific error feedback
       await this.router.replace({
@@ -237,7 +241,6 @@ export class DeepLinkHandler {
           originalPath: path,
           errorCode: "ROUTING_ERROR",
           errorMessage: `Error routing to ${routeName}: ${JSON.stringify(error)}`,
-          ...validatedQuery,
         },
       });
     }
@@ -260,8 +263,9 @@ export class DeepLinkHandler {
       await this.validateAndRoute(path, sanitizedParams, query);
     } catch (error) {
       const deepLinkError = error as DeepLinkError;
-      console.error(
+      logConsoleAndDb(
         `[DeepLink] Error (${deepLinkError.code}): ${deepLinkError.details}`,
+        true,
       );
 
       throw {

src/views/OnboardMeetingListView.vue

@@ -115,7 +115,6 @@ import {
   serverMessageForUser,
 } from "../libs/endorserServer";
 import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
-import { logger } from "@/utils/logger";
 import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
 import { NotificationIface } from "@/constants/app";
 
@@ -413,7 +412,8 @@ export default class OnboardMeetingListView extends Vue {
         true,
       );
       this.notify.error(
-        serverMessageForUser(error) || "There was a problem joining the meeting.",
+        serverMessageForUser(error) ||
+          "There was a problem joining the meeting.",
         TIMEOUTS.LONG,
       );
     }
@@ -471,7 +471,8 @@ export default class OnboardMeetingListView extends Vue {
             true,
           );
           this.notify.error(
-            serverMessageForUser(error) || "There was a problem leaving the meeting.",
+            serverMessageForUser(error) ||
+              "There was a problem leaving the meeting.",
             TIMEOUTS.LONG,
           );
         }