}
subtitle={m.settings_roles_subtitle()}
actions={
canManageRoles && (
diff --git a/app/features/settings/routes/users/account.tsx b/app/features/settings/routes/users/account.tsx
index 53118ea4..9e23807f 100644
--- a/app/features/settings/routes/users/account.tsx
+++ b/app/features/settings/routes/users/account.tsx
@@ -2,6 +2,7 @@ import { getFormProps, useForm } from '@conform-to/react'
import { parseWithZod } from '@conform-to/zod/v4'
import { Status } from '@unitae/ui'
import { data, redirect } from 'react-router'
+import { HelpEntryButton } from '~/features/help'
import { editUserSchema } from '~/features/settings/schemas/user.schema'
import { updateAccount } from '~/features/settings/server/update-account.server'
import { getAccountPage } from '~/features/settings/server/user-accounts.queries'
@@ -35,6 +36,8 @@ export const meta: Route.MetaFunction = ({ loaderData }) => [
{ title: loaderData ? m.settings_account_meta_title({ name: loaderData.name }) : m.settings_users_meta_title() },
]
+export { skipRevalidationForHelpPanel as shouldRevalidate } from '~/features/help'
+
export async function loader({ params, context }: Route.LoaderArgs) {
const permissions = context.get(permissionsContext)
const currentUser = context.get(currentAccountContext)
@@ -130,6 +133,7 @@ export default function AccountPage({ loaderData, actionData }: Route.ComponentP
}
subtitle={page.email}
titleBadge={state &&
{state.label}}
trail={[{ label: m.settings_entry_users(), to: '/settings/users' }]}
diff --git a/app/features/settings/routes/users/user-list.tsx b/app/features/settings/routes/users/user-list.tsx
index ee0caad4..ab030906 100644
--- a/app/features/settings/routes/users/user-list.tsx
+++ b/app/features/settings/routes/users/user-list.tsx
@@ -1,6 +1,7 @@
import { Plus } from 'lucide-react'
import { useState } from 'react'
import { redirect, useSearchParams } from 'react-router'
+import { HelpEntryButton } from '~/features/help'
import { listUserAccounts } from '~/features/settings/server/user-accounts.queries'
import { NewUserDialog } from '~/features/settings/ui/NewUserDialog'
import { SettingsHeader } from '~/features/settings/ui/SettingsHeader'
@@ -15,6 +16,8 @@ import type { Route } from './+types/user-list'
export const meta: Route.MetaFunction = () => [{ title: m.settings_users_meta_title() }]
+export { skipRevalidationForHelpPanel as shouldRevalidate } from '~/features/help'
+
const VIEWS = ['all', 'active', 'deactivated'] as const
type View = (typeof VIEWS)[number]
const isView = (value: string | null): value is View => VIEWS.includes(value as View)
@@ -66,6 +69,7 @@ export default function UserListPage({ loaderData }: Route.ComponentProps) {
}
subtitle={m.settings_users_subtitle()}
actions={
canManage && (
diff --git a/public/help-captures/en/organigram-role-panel.dark.webp b/public/help-captures/en/organigram-role-panel.dark.webp
new file mode 100644
index 00000000..9dc1334e
Binary files /dev/null and b/public/help-captures/en/organigram-role-panel.dark.webp differ
diff --git a/public/help-captures/en/organigram-role-panel.webp b/public/help-captures/en/organigram-role-panel.webp
new file mode 100644
index 00000000..7085ec11
Binary files /dev/null and b/public/help-captures/en/organigram-role-panel.webp differ
diff --git a/public/help-captures/en/settings-account-roles.dark.webp b/public/help-captures/en/settings-account-roles.dark.webp
new file mode 100644
index 00000000..f06957cd
Binary files /dev/null and b/public/help-captures/en/settings-account-roles.dark.webp differ
diff --git a/public/help-captures/en/settings-account-roles.webp b/public/help-captures/en/settings-account-roles.webp
new file mode 100644
index 00000000..30832173
Binary files /dev/null and b/public/help-captures/en/settings-account-roles.webp differ
diff --git a/public/help-captures/en/settings-account-security.dark.webp b/public/help-captures/en/settings-account-security.dark.webp
new file mode 100644
index 00000000..d2fc9441
Binary files /dev/null and b/public/help-captures/en/settings-account-security.dark.webp differ
diff --git a/public/help-captures/en/settings-account-security.webp b/public/help-captures/en/settings-account-security.webp
new file mode 100644
index 00000000..3692c969
Binary files /dev/null and b/public/help-captures/en/settings-account-security.webp differ
diff --git a/public/help-captures/en/settings-audit-toolbar.dark.webp b/public/help-captures/en/settings-audit-toolbar.dark.webp
new file mode 100644
index 00000000..4f8993f3
Binary files /dev/null and b/public/help-captures/en/settings-audit-toolbar.dark.webp differ
diff --git a/public/help-captures/en/settings-audit-toolbar.webp b/public/help-captures/en/settings-audit-toolbar.webp
new file mode 100644
index 00000000..d53d99a4
Binary files /dev/null and b/public/help-captures/en/settings-audit-toolbar.webp differ
diff --git a/public/help-captures/en/settings-data-export.dark.webp b/public/help-captures/en/settings-data-export.dark.webp
new file mode 100644
index 00000000..678c7a44
Binary files /dev/null and b/public/help-captures/en/settings-data-export.dark.webp differ
diff --git a/public/help-captures/en/settings-data-export.webp b/public/help-captures/en/settings-data-export.webp
new file mode 100644
index 00000000..f6785efc
Binary files /dev/null and b/public/help-captures/en/settings-data-export.webp differ
diff --git a/public/help-captures/en/settings-new-user.dark.webp b/public/help-captures/en/settings-new-user.dark.webp
new file mode 100644
index 00000000..9ec5c757
Binary files /dev/null and b/public/help-captures/en/settings-new-user.dark.webp differ
diff --git a/public/help-captures/en/settings-new-user.webp b/public/help-captures/en/settings-new-user.webp
new file mode 100644
index 00000000..93bde0de
Binary files /dev/null and b/public/help-captures/en/settings-new-user.webp differ
diff --git a/public/help-captures/fr/organigram-role-panel.dark.webp b/public/help-captures/fr/organigram-role-panel.dark.webp
new file mode 100644
index 00000000..1d133b94
Binary files /dev/null and b/public/help-captures/fr/organigram-role-panel.dark.webp differ
diff --git a/public/help-captures/fr/organigram-role-panel.webp b/public/help-captures/fr/organigram-role-panel.webp
new file mode 100644
index 00000000..55228161
Binary files /dev/null and b/public/help-captures/fr/organigram-role-panel.webp differ
diff --git a/public/help-captures/fr/settings-account-roles.dark.webp b/public/help-captures/fr/settings-account-roles.dark.webp
new file mode 100644
index 00000000..17c2d01c
Binary files /dev/null and b/public/help-captures/fr/settings-account-roles.dark.webp differ
diff --git a/public/help-captures/fr/settings-account-roles.webp b/public/help-captures/fr/settings-account-roles.webp
new file mode 100644
index 00000000..3e91bbc5
Binary files /dev/null and b/public/help-captures/fr/settings-account-roles.webp differ
diff --git a/public/help-captures/fr/settings-account-security.dark.webp b/public/help-captures/fr/settings-account-security.dark.webp
new file mode 100644
index 00000000..4e674b48
Binary files /dev/null and b/public/help-captures/fr/settings-account-security.dark.webp differ
diff --git a/public/help-captures/fr/settings-account-security.webp b/public/help-captures/fr/settings-account-security.webp
new file mode 100644
index 00000000..e348666e
Binary files /dev/null and b/public/help-captures/fr/settings-account-security.webp differ
diff --git a/public/help-captures/fr/settings-audit-toolbar.dark.webp b/public/help-captures/fr/settings-audit-toolbar.dark.webp
new file mode 100644
index 00000000..c7e57281
Binary files /dev/null and b/public/help-captures/fr/settings-audit-toolbar.dark.webp differ
diff --git a/public/help-captures/fr/settings-audit-toolbar.webp b/public/help-captures/fr/settings-audit-toolbar.webp
new file mode 100644
index 00000000..5123f4e6
Binary files /dev/null and b/public/help-captures/fr/settings-audit-toolbar.webp differ
diff --git a/public/help-captures/fr/settings-data-export.dark.webp b/public/help-captures/fr/settings-data-export.dark.webp
new file mode 100644
index 00000000..fa4340a7
Binary files /dev/null and b/public/help-captures/fr/settings-data-export.dark.webp differ
diff --git a/public/help-captures/fr/settings-data-export.webp b/public/help-captures/fr/settings-data-export.webp
new file mode 100644
index 00000000..7137c300
Binary files /dev/null and b/public/help-captures/fr/settings-data-export.webp differ
diff --git a/public/help-captures/fr/settings-new-user.dark.webp b/public/help-captures/fr/settings-new-user.dark.webp
new file mode 100644
index 00000000..794d4d5b
Binary files /dev/null and b/public/help-captures/fr/settings-new-user.dark.webp differ
diff --git a/public/help-captures/fr/settings-new-user.webp b/public/help-captures/fr/settings-new-user.webp
new file mode 100644
index 00000000..834d08d1
Binary files /dev/null and b/public/help-captures/fr/settings-new-user.webp differ
diff --git a/public/help-captures/pt-PT/organigram-role-panel.dark.webp b/public/help-captures/pt-PT/organigram-role-panel.dark.webp
new file mode 100644
index 00000000..8dceaf50
Binary files /dev/null and b/public/help-captures/pt-PT/organigram-role-panel.dark.webp differ
diff --git a/public/help-captures/pt-PT/organigram-role-panel.webp b/public/help-captures/pt-PT/organigram-role-panel.webp
new file mode 100644
index 00000000..c18e87e3
Binary files /dev/null and b/public/help-captures/pt-PT/organigram-role-panel.webp differ
diff --git a/public/help-captures/pt-PT/settings-account-roles.dark.webp b/public/help-captures/pt-PT/settings-account-roles.dark.webp
new file mode 100644
index 00000000..92045cd1
Binary files /dev/null and b/public/help-captures/pt-PT/settings-account-roles.dark.webp differ
diff --git a/public/help-captures/pt-PT/settings-account-roles.webp b/public/help-captures/pt-PT/settings-account-roles.webp
new file mode 100644
index 00000000..e9184989
Binary files /dev/null and b/public/help-captures/pt-PT/settings-account-roles.webp differ
diff --git a/public/help-captures/pt-PT/settings-account-security.dark.webp b/public/help-captures/pt-PT/settings-account-security.dark.webp
new file mode 100644
index 00000000..f90b9549
Binary files /dev/null and b/public/help-captures/pt-PT/settings-account-security.dark.webp differ
diff --git a/public/help-captures/pt-PT/settings-account-security.webp b/public/help-captures/pt-PT/settings-account-security.webp
new file mode 100644
index 00000000..ef481fa1
Binary files /dev/null and b/public/help-captures/pt-PT/settings-account-security.webp differ
diff --git a/public/help-captures/pt-PT/settings-audit-toolbar.dark.webp b/public/help-captures/pt-PT/settings-audit-toolbar.dark.webp
new file mode 100644
index 00000000..aac150fa
Binary files /dev/null and b/public/help-captures/pt-PT/settings-audit-toolbar.dark.webp differ
diff --git a/public/help-captures/pt-PT/settings-audit-toolbar.webp b/public/help-captures/pt-PT/settings-audit-toolbar.webp
new file mode 100644
index 00000000..3248817d
Binary files /dev/null and b/public/help-captures/pt-PT/settings-audit-toolbar.webp differ
diff --git a/public/help-captures/pt-PT/settings-data-export.dark.webp b/public/help-captures/pt-PT/settings-data-export.dark.webp
new file mode 100644
index 00000000..7a5b5409
Binary files /dev/null and b/public/help-captures/pt-PT/settings-data-export.dark.webp differ
diff --git a/public/help-captures/pt-PT/settings-data-export.webp b/public/help-captures/pt-PT/settings-data-export.webp
new file mode 100644
index 00000000..fc3ecccb
Binary files /dev/null and b/public/help-captures/pt-PT/settings-data-export.webp differ
diff --git a/public/help-captures/pt-PT/settings-new-user.dark.webp b/public/help-captures/pt-PT/settings-new-user.dark.webp
new file mode 100644
index 00000000..93d47c7e
Binary files /dev/null and b/public/help-captures/pt-PT/settings-new-user.dark.webp differ
diff --git a/public/help-captures/pt-PT/settings-new-user.webp b/public/help-captures/pt-PT/settings-new-user.webp
new file mode 100644
index 00000000..302b2f5e
Binary files /dev/null and b/public/help-captures/pt-PT/settings-new-user.webp differ
diff --git a/scripts/help-captures/shots.ts b/scripts/help-captures/shots.ts
index d154ae07..6e218696 100644
--- a/scripts/help-captures/shots.ts
+++ b/scripts/help-captures/shots.ts
@@ -31,6 +31,9 @@ const MARC = 'marc.dupont@demo.unitae.app'
const MAXIME = 'maxime.mensah@demo.unitae.app'
// Maxime's publisher record: someone else's for MARC, whose own status he could not change.
const MAXIME_RECORD = 100
+// Maxime's account, for the pages about an account; and a team of the organigram with people in it.
+const MAXIME_ACCOUNT = 83
+const AUDIO_VIDEO_ROLE = 64
/** The nearest enclosing element that matches, e.g. the row around a button. */
function closest(locator: Locator, xpathTest: string): Locator {
@@ -521,6 +524,75 @@ export const HELP_SHOTS: HelpShot[] = [
margin: -1,
viewport: { width: 1600, height: 900 },
},
+ {
+ // invite-user: « Nouvel utilisateur » on Réglages › Utilisateurs.
+ id: 'settings-new-user',
+ account: MARC,
+ path: '/settings/users',
+ prepare: async (page, locale) => {
+ await page.getByRole('button', { name: m.settings_users_new_button({}, { locale }), exact: true }).click()
+ await page.getByRole('dialog').waitFor()
+ },
+ frame: page => [page.getByRole('dialog')],
+ margin: -1,
+ },
+ {
+ // give-rights: the « Rôles » section of an account.
+ id: 'settings-account-roles',
+ account: MARC,
+ path: `/settings/users/${MAXIME_ACCOUNT}`,
+ // The section's title and its first roles: the whole list runs to every role of the congregation.
+ frame: (page, locale) => [
+ page.getByText(m.settings_account_section_roles({}, { locale }), { exact: true }).first(),
+ section(page, m.settings_account_section_roles({}, { locale })).locator('label').nth(3),
+ ],
+ margin: 12,
+ viewport: { width: 1100, height: 1200 },
+ },
+ {
+ // reset-two-step: the « Sécurité » section of an account.
+ id: 'settings-account-security',
+ account: MARC,
+ path: `/settings/users/${MAXIME_ACCOUNT}`,
+ frame: (page, locale) => [section(page, m.settings_account_section_security({}, { locale }))],
+ margin: 10,
+ viewport: { width: 1100, height: 1400 },
+ },
+ {
+ // organigram: a team's panel, with its people and the search to name someone.
+ id: 'organigram-role-panel',
+ account: MARC,
+ path: `/congregation/roles/organigram?role=${AUDIO_VIDEO_ROLE}`,
+ prepare: settledPanel,
+ frame: page => [sidePanel(page)],
+ margin: -1,
+ viewport: { width: 1600, height: 900 },
+ },
+ {
+ // congregation-data: « Exporter » on Réglages › Import et export.
+ id: 'settings-data-export',
+ account: MARC,
+ path: '/settings/data',
+ frame: (page, locale) => [section(page, m.settings_data_export({}, { locale }))],
+ margin: 10,
+ viewport: { width: 1100 },
+ },
+ {
+ // audit-log: the bar above the journal: the search, the action, the period, the count.
+ id: 'settings-audit-toolbar',
+ account: MARC,
+ path: '/settings/audit-log',
+ // The smallest block holding the search and the period: the whole bar, with the count.
+ frame: (page, locale) => [
+ page
+ .locator('div:visible')
+ .filter({ has: page.getByPlaceholder(m.audit_log_search({}, { locale })) })
+ .filter({ has: page.getByText(m.audit_log_period_30d({}, { locale }), { exact: true }) })
+ .last(),
+ ],
+ margin: 12,
+ viewport: { width: 1100 },
+ },
]
/** Waits for the docked side panel to finish sliding in: framed before, the crop would cut its right side. */
diff --git a/scripts/help-captures/translate-demo-pt-PT.sql b/scripts/help-captures/translate-demo-pt-PT.sql
index 40fb3496..813b786e 100644
--- a/scripts/help-captures/translate-demo-pt-PT.sql
+++ b/scripts/help-captures/translate-demo-pt-PT.sql
@@ -20,7 +20,7 @@ UPDATE "EventPart" t SET "readerLabel" = v.pt FROM (VALUES ('Orateur', 'Orador')
UPDATE "TemplatePart" t SET "readerLabel" = v.pt FROM (VALUES ('Orateur', 'Orador'), ('Lecteur', 'Leitor'), ('Proclamateur', 'Publicador'), ('Interlocuteur', 'Morador'), ('Conducteur', 'Dirigente'), ('Président', 'Presidente'), ('Frère', 'Irmão')) AS v(fr, pt) WHERE t."readerLabel" = v.fr;
UPDATE "EventServicePart" t SET "name" = v.pt FROM (VALUES ('Sono (audio)', 'Áudio'), ('Sono (vidéo)', 'Vídeo'), ('Accueil (porte)', 'Indicador (entrada)'), ('Accueil (auditorium)', 'Indicador (auditório)'), ('Accueil (zoom)', 'Indicador (Zoom)'), ('Perchiste (gauche)', 'Microfones (esquerda)'), ('Perchiste (droite)', 'Microfones (direita)'), ('Audio-vidéo', 'Áudio e vídeo'), ('Estrade', 'Palco'), ('Préposés à l’accueil', 'Indicadores'), ('Nettoyage', 'Limpeza')) AS v(fr, pt) WHERE t."name" = v.fr;
UPDATE "TemplateServicePart" t SET "name" = v.pt FROM (VALUES ('Sono (audio)', 'Áudio'), ('Sono (vidéo)', 'Vídeo'), ('Accueil (porte)', 'Indicador (entrada)'), ('Accueil (auditorium)', 'Indicador (auditório)'), ('Accueil (zoom)', 'Indicador (Zoom)'), ('Perchiste (gauche)', 'Microfones (esquerda)'), ('Perchiste (droite)', 'Microfones (direita)'), ('Audio-vidéo', 'Áudio e vídeo'), ('Estrade', 'Palco'), ('Préposés à l’accueil', 'Indicadores'), ('Nettoyage', 'Limpeza')) AS v(fr, pt) WHERE t."name" = v.fr;
-UPDATE "Role" t SET "name" = v.pt FROM (VALUES ('Conducteur de l’étude de la Tour de Garde', 'Dirigente do Estudo de A Sentinela'), ('Conseiller pour l’enseignement', 'Conselheiro assistente'), ('Coordinateur du nettoyage', 'Coordenador da limpeza'), ('Coordinateur du programme des discours publics', 'Coordenador dos discursos públicos'), ('Covoiturage pour les compagnons âgés', 'Transporte para os mais idosos'), ('Lecteurs EBA/TG', 'Leitores (Estudo Bíblico, A Sentinela)'), ('Orateurs DP', 'Oradores de discursos públicos'), ('Orateurs EBA', 'Dirigentes do Estudo Bíblico de Congregação'), ('Orateurs Joyaux', 'Oradores de Tesouros'), ('Orateurs Perles', 'Oradores de Pérolas espirituais'), ('Orateurs VCM', 'Oradores de Viver Como Cristãos'), ('Perches', 'Microfones'), ('Porte', 'Indicadores da entrada'), ('Prières publiques', 'Orações públicas'), ('Prospection', 'Levantamento de edifícios'), ('Présidents DP/TG', 'Presidentes da reunião de fim de semana'), ('Présidents VCM', 'Presidentes da reunião de semana'), ('RPP', 'Reunião dos superintendentes de grupo'), ('Responsable Réunion Vie Chrétienne et Ministère', 'Superintendente da Reunião Vida e Ministério Cristãos'), ('Responsable du programme des services', 'Coordenador da escala de serviços'), ('Scène', 'Palco'), ('Service Accueil', 'Indicadores'), ('Service Audio/Vidéo', 'Áudio e vídeo'), ('Service Comptes', 'Contas'), ('Service Publications', 'Publicações'), ('Service TPL', 'Testemunho público'), ('Service Territoires', 'Territórios'), ('Sono', 'Áudio'), ('Visite pastorale', 'Visitas de pastoreio')) AS v(fr, pt) WHERE t."name" = v.fr;
+UPDATE "Role" t SET "name" = v.pt FROM (VALUES ('Conducteur de l’étude de la Tour de Garde', 'Dirigente do Estudo de A Sentinela'), ('Conseiller pour l’enseignement', 'Conselheiro assistente'), ('Coordinateur du nettoyage', 'Coordenador da limpeza'), ('Coordinateur du programme des discours publics', 'Coordenador dos discursos públicos'), ('Covoiturage pour les compagnons âgés', 'Transporte para os mais idosos'), ('Lecteurs EBA/TG', 'Leitores (Estudo Bíblico, A Sentinela)'), ('Orateurs DP', 'Oradores de discursos públicos'), ('Orateurs EBA', 'Dirigentes do Estudo Bíblico de Congregação'), ('Orateurs Joyaux', 'Oradores de Tesouros'), ('Orateurs Perles', 'Oradores de Pérolas espirituais'), ('Orateurs VCM', 'Oradores de Viver Como Cristãos'), ('Perches', 'Microfones'), ('Porte', 'Indicadores da entrada'), ('Prières publiques', 'Orações públicas'), ('Prospection', 'Levantamento de edifícios'), ('Présidents DP/TG', 'Presidentes da reunião de fim de semana'), ('Présidents VCM', 'Presidentes da reunião de semana'), ('RPP', 'Reunião dos superintendentes de grupo'), ('Responsable Réunion Vie Chrétienne et Ministère', 'Superintendente da Reunião Vida e Ministério Cristãos'), ('Responsable du programme des services', 'Coordenador da escala de serviços'), ('Scène', 'Palco'), ('Service Accueil', 'Indicadores'), ('Service Audio/Vidéo', 'Áudio e vídeo'), ('Service Comptes', 'Contas'), ('Service Publications', 'Publicações'), ('Service TPL', 'Testemunho público'), ('Service Territoires', 'Territórios'), ('Sono', 'Áudio'), ('Visite pastorale', 'Visitas de pastoreio'), ('Auditorium', 'Auditório')) AS v(fr, pt) WHERE t."name" = v.fr;
UPDATE "PublisherGroup" t SET "name" = v.pt FROM (VALUES ('Groupe Centre', 'Grupo Centro'), ('Groupe Nord', 'Grupo Norte'), ('Groupe Sud', 'Grupo Sul'), ('Groupe Est', 'Grupo Este'), ('Groupe Ouest', 'Grupo Oeste')) AS v(fr, pt) WHERE t."name" = v.fr;
UPDATE "BoardSection" t SET "name" = v.pt FROM (VALUES ('Annonces', 'Anúncios'), ('Programmes', 'Programas'), ('Prédication', 'Serviço de campo'), ('Entretien', 'Manutenção'), ('Comptes', 'Contas'), ('Vie de l’assemblée', 'Vida da congregação')) AS v(fr, pt) WHERE t."name" = v.fr;
UPDATE "BoardDocument" t SET "title" = v.pt FROM (VALUES ('Accueil des nouveaux', 'Acolher os novos'), ('Visite du responsable de circonscription', 'Visita do superintendente de circuito'), ('Plan d’évacuation', 'Plano de evacuação'), ('Rapport des comptes', 'Relatório de contas'), ('Consignes de sécurité', 'Instruções de segurança'), ('Planning de nettoyage', 'Escala de limpeza'), ('Planning TPL', 'Escala de testemunho público'), ('Rendez-vous de prédication', 'Reuniões para o serviço de campo'), ('Assemblée de circonscription', 'Assembleia de circuito'), ('Programme des discours publics', 'Programa dos discursos públicos'), ('Rappel : covoiturage pour l’assemblée de circonscription', 'Lembrete: boleias para a assembleia de circuito'), ('Lettre du Collège central', 'Carta do Corpo Governante'), ('Changement d’horaire des réunions', 'Mudança do horário das reuniões')) AS v(fr, pt) WHERE t."title" = v.fr;