@antelopejs/dms 0.7.21 → 0.8.1

package/frontend-vue/layers/dms-layout/app/emails/EmailTwoFactor.vue

@@ -1,18 +1,37 @@
 <script setup lang="ts">
+import { useI18n } from "vue-i18n";
 import EmailLayout from "./components/EmailLayout.vue";
 import EmailOTP from "./components/EmailOTP.vue";
+import { emailStyles } from "./components/index";
 
 defineProps<{
   userName: string;
   verificationCode: string;
 }>();
+
+const { t, locale } = useI18n();
 </script>
 
 <template>
-  <EmailLayout title="Your verification code">
-    <p>Hello {{ userName }},</p>
-    <p>Use this verification code to finish signing in:</p>
+  <EmailLayout
+    :title="t('emails.two_factor.title')"
+    :lang="locale"
+    public-logo-only
+  >
+    <EText :style="emailStyles.text">
+      {{ t("emails.common.greeting", { name: userName }) }}
+    </EText>
+
+    <EText :style="emailStyles.text">
+      {{ t("emails.two_factor.body") }}
+    </EText>
+
     <EmailOTP :code="verificationCode" />
-    <p>If you did not attempt to sign in, you can safely ignore this email.</p>
+
+    <template #footer>
+      <EText :style="emailStyles.footer">
+        {{ t("emails.two_factor.footer") }}
+      </EText>
+    </template>
   </EmailLayout>
 </template>

package/frontend-vue/layers/dms-layout/app/emails/EmailUserValidation.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { useI18n } from "vue-i18n";
 import EmailLayout from "./components/EmailLayout.vue";
 import EmailOTP from "./components/EmailOTP.vue";
 import { emailStyles } from "./components/index";
@@ -7,23 +8,34 @@ defineProps<{
   userName: string;
   validationCode: string;
   expiresIn: string;
+  expiresInHours: number;
 }>();
+
+const { t, locale } = useI18n();
 </script>
 
 <template>
-  <EmailLayout title="Verify Your Email">
-    <EText :style="emailStyles.text">Hello {{ userName }},</EText>
+  <EmailLayout
+    :title="t('emails.user_validation.title')"
+    :lang="locale"
+    public-logo-only
+  >
+    <EText :style="emailStyles.text">
+      {{ t("emails.common.greeting", { name: userName }) }}
+    </EText>
 
     <EText :style="emailStyles.text">
-      Thank you for signing up! Enter the verification code below to verify your
-      email address:
+      {{ t("emails.user_validation.body") }}
     </EText>
 
-    <EmailOTP :code="validationCode" :expires-in="expiresIn" />
+    <EmailOTP
+      :code="validationCode"
+      :expires-in="t('emails.common.hours', expiresInHours)"
+    />
 
     <template #footer>
       <EText :style="emailStyles.footer">
-        If you didn't create an account, you can safely ignore this email.
+        {{ t("emails.user_validation.footer") }}
       </EText>
     </template>
   </EmailLayout>

package/frontend-vue/layers/dms-layout/app/emails/components/EmailOTP.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { useI18n } from "vue-i18n";
 import { emailStyles } from "./index";
 
 defineProps<{
@@ -6,17 +7,22 @@ defineProps<{
   expiresIn?: string;
   expiresLabel?: string;
 }>();
+
+const { t } = useI18n();
 </script>
 
 <template>
   <ESection :style="emailStyles.otp.box">
-    <EText :style="emailStyles.otp.label">Your verification code is:</EText>
+    <EText :style="emailStyles.otp.label">
+      {{ t("emails.common.code_label") }}
+    </EText>
     <EText :style="emailStyles.otp.code">
       {{ code }}
     </EText>
   </ESection>
 
   <EText v-if="expiresIn" :style="emailStyles.expires">
-    {{ expiresLabel ?? "This code expires in" }} {{ expiresIn }}.
+    {{ expiresLabel ?? t("emails.common.code_expires_label") }}
+    {{ expiresIn }}.
   </EText>
 </template>

package/frontend-vue/layers/dms-layout/i18n/locales/layout-en-GB.json

@@ -867,6 +867,46 @@
       "expires_label": "This invitation expires in",
       "expires_in": "{days} days",
       "footer": "If you didn't expect this invitation, you can safely ignore this email."
+    },
+    "common": {
+      "greeting": "Hello {name},",
+      "code_label": "Your verification code is:",
+      "code_expires_label": "This code expires in",
+      "hours": "{count} hour | {count} hours"
+    },
+    "user_validation": {
+      "title": "Verify Your Email",
+      "body": "Thank you for signing up! Enter the verification code below to verify your email address:",
+      "footer": "If you didn't create an account, you can safely ignore this email."
+    },
+    "reset_password": {
+      "title": "Reset Your Password",
+      "body": "We received a request to reset your password. Enter the verification code below to reset your password:",
+      "footer": "If you didn't request a password reset, you can safely ignore this email. Your password will remain unchanged."
+    },
+    "two_factor": {
+      "title": "Your verification code",
+      "body": "Use this verification code to finish signing in:",
+      "footer": "If you did not attempt to sign in, you can safely ignore this email."
+    },
+    "email_change_verification": {
+      "title": "Confirm your new sign-in email",
+      "body": "Enter the code below to make {email} the sign-in email of your account:",
+      "footer": "If you didn't ask for this change, you can safely ignore this email: your account keeps its current address."
+    },
+    "email_change_notice": {
+      "title": "Your sign-in email is being changed",
+      "body": "Someone signed in to your account asked to change its sign-in email to {email}. The change takes effect once that address is confirmed.",
+      "footer": "If this wasn't you, change your password now and sign out the other sessions in Security: your account keeps this address until the new one is confirmed."
+    },
+    "export_ready": {
+      "title": "Your data export is ready",
+      "body": "Your data export has been prepared. Use the button below to download the archive:",
+      "button": "Download export",
+      "expires_label": "This download link expires in",
+      "partial": "This export is {incomplete}: the following parts could not be included — {sources}. Request a new export if you need them.",
+      "incomplete": "incomplete",
+      "footer": "If you didn't request this export, you can safely ignore this email."
     }
   },
   "empty_layout": {

package/frontend-vue/layers/dms-layout/i18n/locales/layout-fr-FR.json

@@ -871,6 +871,46 @@
       "expires_label": "Cette invitation expire dans",
       "expires_in": "{days} jours",
       "footer": "Si vous n'attendiez pas cette invitation, vous pouvez ignorer cet e-mail."
+    },
+    "common": {
+      "greeting": "Bonjour {name},",
+      "code_label": "Votre code de vérification :",
+      "code_expires_label": "Ce code expire dans",
+      "hours": "{count} heure | {count} heures"
+    },
+    "user_validation": {
+      "title": "Vérifiez votre adresse e-mail",
+      "body": "Merci pour votre inscription ! Saisissez le code ci-dessous pour vérifier votre adresse e-mail :",
+      "footer": "Si vous n'avez pas créé de compte, vous pouvez ignorer cet e-mail."
+    },
+    "reset_password": {
+      "title": "Réinitialisez votre mot de passe",
+      "body": "Nous avons reçu une demande de réinitialisation de votre mot de passe. Saisissez le code ci-dessous pour le réinitialiser :",
+      "footer": "Si vous n'êtes pas à l'origine de cette demande, vous pouvez ignorer cet e-mail. Votre mot de passe reste inchangé."
+    },
+    "two_factor": {
+      "title": "Votre code de vérification",
+      "body": "Saisissez ce code de vérification pour terminer votre connexion :",
+      "footer": "Si vous n'avez pas essayé de vous connecter, vous pouvez ignorer cet e-mail."
+    },
+    "email_change_verification": {
+      "title": "Confirmez votre nouvelle adresse de connexion",
+      "body": "Saisissez le code ci-dessous pour faire de {email} l'adresse de connexion de votre compte :",
+      "footer": "Si vous n'avez pas demandé ce changement, vous pouvez ignorer cet e-mail : votre compte garde son adresse actuelle."
+    },
+    "email_change_notice": {
+      "title": "Votre adresse de connexion va changer",
+      "body": "Une personne connectée à votre compte a demandé à remplacer son adresse de connexion par {email}. Le changement prendra effet une fois cette adresse confirmée.",
+      "footer": "Si ce n'est pas vous, changez votre mot de passe maintenant et déconnectez les autres sessions dans Sécurité : votre compte garde cette adresse tant que la nouvelle n'est pas confirmée."
+    },
+    "export_ready": {
+      "title": "Votre export de données est prêt",
+      "body": "Votre export de données a été préparé. Utilisez le bouton ci-dessous pour télécharger l'archive :",
+      "button": "Télécharger l'export",
+      "expires_label": "Ce lien de téléchargement expire dans",
+      "partial": "Cet export est {incomplete} : les parties suivantes n'ont pas pu être incluses — {sources}. Demandez un nouvel export si vous en avez besoin.",
+      "incomplete": "incomplet",
+      "footer": "Si vous n'avez pas demandé cet export, vous pouvez ignorer cet e-mail."
     }
   },
   "empty_layout": {

package/frontend-vue/layers/dms-ui/app/build/components/form/FormFieldControl.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { pageLink } from "../../composables/page/pageUrlValues";
 import type {
   FormField,
   FormFieldReadonly,
@@ -79,7 +80,7 @@ const readonly = computed<FormFieldReadonly>(() =>
         />
         <DmsAutoLink
           v-if="readonly.link"
-          :to="readonly.link.to"
+          :to="pageLink(readonly.link.to)"
           class="text-primary ms-auto text-[12.5px] font-medium"
         >
           {{ processI18n(readonly.link.label) }}

package/frontend-vue/layers/dms-ui/app/build/components/form/FormLoadError.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
-import DmsEmptyState from "../../../components/empty-state/EmptyState.vue";
+import DmsEmptyState, {
+  type EmptyStateVariant,
+} from "../../../components/empty-state/EmptyState.vue";
 import type { FormLoadFailure } from "../../composables/form/formRecordLoad";
 
 // What a form shows instead of its fields when the record it edits did not
@@ -21,16 +23,22 @@ const props = withDefaults(defineProps<FormLoadErrorProps>(), {
 const emit = defineEmits<FormLoadErrorEmits>();
 
 const { t } = useI18n();
+
+const VARIANTS: Record<FormLoadFailure, EmptyStateVariant> = {
+  forbidden: "no-access",
+  missing: "no-data",
+  error: "error",
+};
 </script>
 
 <template>
   <DmsEmptyState
     size="md"
-    :variant="props.failure === 'forbidden' ? 'no-access' : 'error'"
+    :variant="VARIANTS[props.failure]"
     :title="t(`dms.form.load_error.${props.failure}_title`)"
     :description="t(`dms.form.load_error.${props.failure}_description`)"
   >
-    <template #actions>
+    <template v-if="props.failure !== 'missing'" #actions>
       <UButton
         :label="t('dms.form.load_error.retry')"
         icon="i-ph-arrows-clockwise"

package/frontend-vue/layers/dms-ui/app/build/composables/actions/useActionTargets.ts

@@ -52,52 +52,47 @@ import {
   findServedQuickAction,
 } from "../../utils/dispatchQuickActionTarget";
 import {
-  hasUrlVariables,
+  namesPageValue,
   resolveLinkVariables,
   resolveTextVariables,
 } from "../../utils/urlVariables";
-import { interpolateLiteral } from "../../utils/literalText";
+import { currentPageUrlValues } from "../page/pageUrlValues";
 import { type DownloadFetch, saveDownload } from "../../utils/fileDownload";
+import { interpolateRowText } from "#dms-core/app/utils/url-interpolation";
 
 /** Runs a confirmed action from inside its dialog (see `onConfirm`). */
 type ConfirmedRun = NonNullable<ConfirmOptions["onConfirm"]>;
 
 /**
- * A link target's URL with the page's `{{params.X}}` / `{{query.X}}` filled
- * (a query pair without a value left out), then the row's `{field}`: a row
+ * A target's URL with the page's `{{params.X}}` / `{{query.X}}` filled (a
+ * query pair without a value left out), then the row's `{{row.field}}`: an
  * action keeps the page's context (`?website={{query.website}}`) as a page
- * header button does. Read when the link is followed, so it carries the URL
- * as it is then.
+ * header button does, whatever its type and wherever it sits. Read when the
+ * action runs, so it carries the URL as it is then.
  */
-function linkTargetUrl(url: string, rowData?: Data): string {
-  const withPageValues = hasUrlVariables(url)
+function targetUrl(url: string, rowData?: Data): string {
+  const withPageValues = namesPageValue(url)
     ? resolveLinkVariables(url, currentPageUrlValues())
     : url;
   return rowData ? interpolateUrl(withPageValues, rowData) : withPageValues;
 }
 
 /**
- * A download target's file name with the page's tokens filled as they are
- * (a name, not a URL: nothing is encoded), then the row's `{field}`. A token
- * the page has no value for leaves no name: the server's one is used.
+ * A download target's file name with the row's `{{row.field}}` and the
+ * page's tokens filled as they are (a name, not a URL: nothing is encoded). A
+ * token without a value leaves no name: the server's one is used.
  */
 function downloadTargetFilename(
   filename: string | undefined,
   rowData?: Data,
 ): string | undefined {
   if (!filename) return undefined;
-  const withPageValues = resolveTextVariables(filename, currentPageUrlValues());
-  if (!withPageValues || !rowData) return withPageValues;
-  return interpolateLiteral(withPageValues, rowData);
+  const withRow = rowData ? interpolateRowText(filename, rowData) : filename;
+  return resolveTextVariables(withRow, currentPageUrlValues());
 }
 
-function currentPageUrlValues() {
-  const route = useDmsRoute();
-  return {
-    routeParams: useSiteLayout().findMatchingRoute(route.path)?.params,
-    routeQuery: route.query as Record<string, unknown>,
-  };
-}
+// The id an export job's start answered, in its `statusUrl` / `downloadUrl`.
+const JOB_ID_TOKEN = /\{\{\s*job\.id\s*\}\}/g;
 
 /** Where the buttons run: the requests they send, what they refresh. */
 export interface ActionTargetsConfig {
@@ -119,7 +114,7 @@ export interface ActionTargetsConfig {
    */
   onRecordShown?: (id?: string) => void;
   /**
-   * The field a row's id is read from (`_id` by default): it fills `{id}` in
+   * The field a row's id is read from (`_id` by default): it fills `{{row.id}}` in
    * the `from` URL of a row action's confirmation, as on a built-in action.
    */
   rowIdKey?: string;
@@ -275,7 +270,10 @@ export function useActionTargets(config: ActionTargetsConfig) {
     const statusUrlTemplate = target.statusUrl;
     const downloadUrlTemplate = target.downloadUrl;
     const interpolate = (template: string, ticket: ExportJobTicket): string =>
-      interpolateUrl(template, { ...(rowData ?? {}), jobId: ticket.jobId });
+      targetUrl(
+        template.replace(JOB_ID_TOKEN, encodeURIComponent(ticket.jobId)),
+        rowData,
+      );
     await runExportJob({
       startUrl: url,
       startMethod: target.method ?? "POST",
@@ -299,7 +297,7 @@ export function useActionTargets(config: ActionTargetsConfig) {
     try {
       await saveDownload(
         {
-          url: linkTargetUrl(target.url, rowData),
+          url: targetUrl(target.url, rowData),
           filename: downloadTargetFilename(target.filename, rowData),
         },
         fetchRaw,
@@ -538,11 +536,11 @@ export function useActionTargets(config: ActionTargetsConfig) {
   const targetHandlers: Record<string, TargetHandler> = {
     page: (target, _label, rowData) => {
       const pageTarget = target as ActionTarget & { type: "page" };
-      navigateDms(linkTargetUrl(pageTarget.url, rowData));
+      navigateDms(targetUrl(pageTarget.url, rowData));
     },
     external: (target, _label, rowData) => {
       const externalTarget = target as ActionTarget & { type: "external" };
-      const url = linkTargetUrl(externalTarget.url, rowData);
+      const url = targetUrl(externalTarget.url, rowData);
       if (typeof window === "undefined" || !url) return;
       if (externalTarget.newTab) {
         window.open(url, "_blank", "noopener,noreferrer");
@@ -552,16 +550,12 @@ export function useActionTargets(config: ActionTargetsConfig) {
     },
     api: async (target, label, rowData) => {
       const apiTarget = target as ActionTarget & { type: "api" };
-      const url = rowData
-        ? interpolateUrl(apiTarget.url, rowData)
-        : apiTarget.url;
+      const url = targetUrl(apiTarget.url, rowData);
       await handleApiTarget(apiTarget, url, label, rowData);
     },
     exportJob: async (target, _label, rowData) => {
       const jobTarget = target as ActionTarget & { type: "exportJob" };
-      const url = rowData
-        ? interpolateUrl(jobTarget.url, rowData)
-        : jobTarget.url;
+      const url = targetUrl(jobTarget.url, rowData);
       await handleExportJobTarget(jobTarget, url, rowData);
     },
     download: (target, label, rowData) =>
@@ -581,9 +575,6 @@ export function useActionTargets(config: ActionTargetsConfig) {
     sidePanel: sidePanelHandler,
   };
 
-  const targetUrl = (url: string, rowData?: Data): string =>
-    rowData ? interpolateUrl(url, rowData) : url;
-
   // A target making a request runs it from inside its confirmation, which
   // shows a refusal (under its field when it names one) and stays open; any
   // other runs once confirmed.
@@ -604,7 +595,7 @@ export function useActionTargets(config: ActionTargetsConfig) {
     },
   };
 
-  // `{id}` of a confirmation's `from` URL, when the row carries an id.
+  // `{{row.id}}` of a confirmation's `from` URL, when the row carries an id.
   const rowUrlParams = (rowData?: Data) => {
     const id = rowData
       ? get(rowData, config.rowIdKey ?? DEFAULT_ROW_ID_KEY)

package/frontend-vue/layers/dms-ui/app/build/composables/chart/apexTheme.ts

@@ -18,9 +18,19 @@ const DATA_LABEL_FONT_SIZE = "11px";
 const DATA_LABEL_FONT_WEIGHT = 600;
 const TOOLTIP_DATETIME_FORMAT = "dd MMM yyyy";
 const HOVER_MARKER_SIZE = 5;
+/** Grows a visible point on hover instead of setting a size below its own. */
+const HOVER_POINT_SIZE_OFFSET = 2;
+/** A scatter is nothing but its points, so it draws them without `pointSize`. */
+const DEFAULT_POINT_SIZE = 6;
+const POINT_MARKER_TYPES: ChartType[] = ["scatter"];
+/** Half a data label's box and a gap: lifts the label off the point it names. */
+const POINT_LABEL_CLEARANCE = 11;
+const HALF = 2;
 const HEAD_MARKER_SIZE = 5;
 const SOLID_GRID = 0;
 const HEAD_MARKER_TYPES: ChartType[] = ["line", "area"];
+/** A radar draws its own polygon grid; the cartesian one would cross the card. */
+const OWN_GRID_TYPES: ChartType[] = ["radar"];
 
 /** Theme colors every section of an Apex config reads once per build. */
 export interface ApexThemeColors {
@@ -83,7 +93,10 @@ export function buildGrid(
   theme: ApexThemeColors,
 ): Record<string, unknown> {
   return {
-    show: !isCircular && (input.showGrid ?? true),
+    show:
+      !isCircular &&
+      !OWN_GRID_TYPES.includes(input.type) &&
+      (input.showGrid ?? true),
     borderColor: theme.border,
     strokeDashArray: SOLID_GRID,
     padding: GRID_PADDING,
@@ -140,6 +153,13 @@ export function buildMarkers(
   colors: string[],
   theme: ApexThemeColors,
 ): Record<string, unknown> {
+  if (POINT_MARKER_TYPES.includes(input.type)) {
+    return {
+      size: pointSize(input),
+      strokeWidth: 0,
+      hover: { sizeOffset: HOVER_POINT_SIZE_OFFSET },
+    };
+  }
   const showsHead = HEAD_MARKER_TYPES.includes(input.type) && !input.stacked;
   return {
     size: 0,
@@ -151,18 +171,55 @@ export function buildMarkers(
   };
 }
 
-/** Value labels in mono, without Apex's default drop shadow. */
+function pointSize(input: UseApexChartInput): number {
+  return input.pointSize ?? DEFAULT_POINT_SIZE;
+}
+
+/**
+ * How far a data label moves up: Apex centres it on its point, which hides a
+ * scatter's point under its own label.
+ */
+export function dataLabelOffset(input: UseApexChartInput): number {
+  if (!POINT_MARKER_TYPES.includes(input.type)) return 0;
+  return -(pointSize(input) / HALF + POINT_LABEL_CLEARANCE);
+}
+
+/** Where Apex is drawing a data label. */
+interface DataLabelContext {
+  seriesIndex: number;
+  dataPointIndex: number;
+  w: { config: { series: ChartSeries[] } };
+}
+
+/** A point's own `label` when it has one, else the value Apex would print. */
+function pointLabel(value: unknown, context: DataLabelContext): unknown {
+  const point =
+    context.w.config.series[context.seriesIndex]?.data[context.dataPointIndex];
+  if (typeof point !== "object" || point === null || !("label" in point)) {
+    return value;
+  }
+  return point.label || value;
+}
+
+/**
+ * Value labels in mono, without Apex's default drop shadow. A circular chart
+ * keeps Apex's own percent formatter: its series hold bare numbers.
+ */
 export function buildDataLabels(
   enabled: boolean,
   theme: ApexThemeColors,
+  isCircular = false,
+  offsetY = 0,
 ): Record<string, unknown> {
   return {
     enabled,
+    offsetY,
     dropShadow: { enabled: false },
     style: {
       fontSize: DATA_LABEL_FONT_SIZE,
       fontFamily: theme.monoFont,
       fontWeight: DATA_LABEL_FONT_WEIGHT,
     },
+    ...(isCircular ? {} : { formatter: pointLabel }),
   };
 }

package/frontend-vue/layers/dms-ui/app/build/composables/confirm/confirmDialogTexts.ts

@@ -3,7 +3,10 @@ import type {
   ConfirmDialogSecondaryAction,
   ConfirmDialogSecondaryTarget,
 } from "#dms-core/app/types/confirm-dialog";
-import { interpolateUrl } from "#dms-core/app/utils/url-interpolation";
+import {
+  interpolateRowText,
+  interpolateUrl,
+} from "#dms-core/app/utils/url-interpolation";
 import { readTranslationKey } from "#dms-core/app/composables/translation/useTranslation";
 import type {
   ConfirmOptions,
@@ -11,6 +14,12 @@ import type {
 } from "../../../composables/confirm/types";
 import { processFieldI18n } from "../../utils/fieldOptionsI18n";
 import { interpolateLiteral } from "../../utils/literalText";
+import {
+  namesPageValue,
+  resolveLinkVariables,
+  resolveTextVariables,
+} from "../../utils/urlVariables";
+import { currentPageUrlValues } from "../page/pageUrlValues";
 
 /** `t` as vue-i18n gives it: named parameters, then the plural count. */
 export type ConfirmTranslate = (
@@ -41,22 +50,36 @@ export type SecondaryTargetRun = (
   target: ConfirmDialogSecondaryTarget,
 ) => Promise<void> | void;
 
+// The page's `{{params.X}}` / `{{query.X}}` come first, as on an action's own
+// target; the route is only read for a text holding such a token.
+function withPageLink(url: string): string {
+  return namesPageValue(url)
+    ? resolveLinkVariables(url, currentPageUrlValues())
+    : url;
+}
+
+function withPageText(text: string): string | undefined {
+  return namesPageValue(text)
+    ? resolveTextVariables(text, currentPageUrlValues())
+    : text;
+}
+
 /**
  * A dialog's secondary target with its URL (and file name) filled in with
- * the same parameters as its texts.
+ * the page's values and, as `{{row.X}}`, the same parameters as its texts.
  */
 function resolveSecondaryTarget(
   target: ConfirmDialogSecondaryTarget,
   params: Record<string, unknown>,
 ): ConfirmDialogSecondaryTarget {
-  const url = interpolateUrl(target.url, params);
+  const url = interpolateUrl(withPageLink(target.url), params);
   if (target.type !== "download" || target.filename === undefined) {
     return { ...target, url };
   }
   return {
     ...target,
     url,
-    filename: interpolateLiteral(target.filename, params),
+    filename: withPageText(interpolateRowText(target.filename, params)),
   };
 }
 

package/frontend-vue/layers/dms-ui/app/build/composables/confirm/useActionConfirm.ts

@@ -15,12 +15,17 @@ import {
 } from "./confirmDialogTexts";
 import type { DownloadFetch } from "../../utils/fileDownload";
 import { secondaryTargetRunner } from "./secondaryTarget";
+import {
+  namesPageValue,
+  resolveLinkVariables,
+} from "../../utils/urlVariables";
+import { currentPageUrlValues } from "../page/pageUrlValues";
 
 /** What an action asks its confirmation with. */
 export interface ActionConfirmRequest {
   /** The row the action targets: its fields fill the texts and `from` URL. */
   row?: Record<string, unknown>;
-  /** Fill-ins of a `from` URL besides the row's fields (`{id}`). */
+  /** Fill-ins of a `from` URL besides the row's fields (`{{row.id}}`). */
   urlParams?: Record<string, unknown>;
   /**
    * The look of the action, where the dialog leaves it out (an archive's
@@ -55,7 +60,10 @@ export function useActionConfirm() {
     request: ActionConfirmRequest,
   ): Promise<ConfirmDialog | undefined> => {
     if (!isConfirmFrom(declared)) return declared;
-    const url = interpolateUrl(declared.from, {
+    const from = namesPageValue(declared.from)
+      ? resolveLinkVariables(declared.from, currentPageUrlValues())
+      : declared.from;
+    const url = interpolateUrl(from, {
       ...request.row,
       ...request.urlParams,
     });

package/frontend-vue/layers/dms-ui/app/build/composables/data-types/registerDefaults.ts

@@ -322,13 +322,8 @@ function renderRelation(value: unknown, options: unknown) {
 }
 
 function renderCascaderRelation(value: unknown, options: unknown) {
-  const { t } = useI18n();
   const opts = options as CascaderRelationOptions | undefined;
 
-  if (opts?.multiple && Array.isArray(value)) {
-    return t("dms.form.cascader.selected_count", { count: value.length });
-  }
-
   if (!value) return value;
 
   return h(CascaderPath, {

package/frontend-vue/layers/dms-ui/app/build/composables/form/formEntryOrder.ts

@@ -0,0 +1,23 @@
+import type { FormFieldOrGroup } from "../../../composables/form/types/field";
+import { isFieldGroup } from "../../../composables/form/types/field";
+
+function entryOrder(entry: FormFieldOrGroup): number | undefined {
+  return isFieldGroup(entry) ? entry.order : undefined;
+}
+
+/**
+ * A form's entries with its groups' `order` applied: the groups giving one
+ * trade the places they were declared at, sorted on it (equal orders keep
+ * their declaration order); every other entry keeps its place.
+ */
+export function orderFormEntries<T extends FormFieldOrGroup>(
+  entries: readonly T[],
+): T[] {
+  const ordered = entries
+    .filter((entry) => entryOrder(entry) !== undefined)
+    .sort((left, right) => entryOrder(left)! - entryOrder(right)!);
+  let next = 0;
+  return entries.map((entry) =>
+    entryOrder(entry) === undefined ? entry : ordered[next++]!,
+  );
+}