Merge branch 'staging-new' of https://github.com/hcengineering/platform

Author: ArtyomSavchenko

plugins/login-resources/src/utils.ts

@@ -1012,13 +1012,21 @@ export async function doLoginNavigate (
       }
     }
 
+    const currentLoc = getCurrentLocation()
+
     const loc = getCurrentLocation()
     loc.path[1] = result.token != null ? 'selectWorkspace' : 'confirmationSend'
     loc.path.length = 2
     if (navigateUrl !== undefined) {
       loc.query = { ...loc.query, navigateUrl }
     }
 
+    // If we're already on the target page, reload to refresh state
+    if (loc.path.length === currentLoc.path.length && isSameSegments(currentLoc, loc, loc.path.length)) {
+      window.location.reload()
+      return
+    }
+
     navigate(loc)
   }
 }

plugins/text-editor-resources/src/components/extension/table/actions/OriginalTableDataViewer.svelte

@@ -38,15 +38,13 @@
   let tableQuery: DocumentQuery<Doc>
   $: tableQuery = documentIds.length > 0 ? { _id: { $in: documentIds as any[] } } : (query ?? {})
 
-  // Use config from viewlet if available, otherwise use metadata config
-  // RelationshipTable doesn't use viewlets, so config comes directly from metadata
-  // Ensure config is never empty - use default empty string key for default presenter
+  // Use metadata config, otherwise use viewlet config
   $: viewletConfig = viewlet?.config
   $: tableConfig =
-    viewletConfig !== undefined && viewletConfig.length > 0
-      ? viewletConfig
-      : config !== undefined && config.length > 0
-        ? config
+    config !== undefined && config.length > 0
+      ? config
+      : viewletConfig !== undefined && viewletConfig.length > 0
+        ? viewletConfig
         : ['']
 
   // Get component from viewlet descriptor lookup

services/mail/pod-mail/src/mail.ts

@@ -47,14 +47,16 @@ export class MailClient {
   async sendMessage (message: SendMailOptions, ctx: MeasureContext, password?: string | undefined): Promise<void> {
     const from = message.from as string
     const transporter = this.getTransporter(from, password)
-    transporter.sendMail(message, (err, info) => {
-      const messageInfo = `(from: ${from}, to: ${message.to as string})`
-      if (err !== null) {
-        ctx.error(`Failed to send email ${messageInfo}: ${err.message}`)
-        Analytics.handleError(err)
-      } else {
-        ctx.info(`Email request ${messageInfo} sent: ${info?.response}`)
-      }
+    await ctx.with('send', {}, async (ctx) => {
+      transporter.sendMail(message, (err, info) => {
+        const messageInfo = `(from: ${from}, to: ${message.to as string})`
+        if (err !== null) {
+          ctx.error(`Failed to send email ${messageInfo}: ${err.message}`)
+          Analytics.handleError(err)
+        } else {
+          ctx.info(`Email request ${messageInfo} sent: ${info?.response}`)
+        }
+      })
     })
   }
 

services/mail/pod-mail/src/main.ts

@@ -52,7 +52,8 @@ export const main = async (): Promise<void> => {
       endpoint: '/send',
       type: 'post',
       handler: async (req, res) => {
-        await handleSendMail(client, req, res, measureCtx)
+        const { to } = req.body
+        await measureCtx.with('send email', {}, (ctx) => handleSendMail(client, req, res, ctx), { to })
       }
     }
   ]