diff --git a/apps/docs/content/docs/users/templates/create.mdx b/apps/docs/content/docs/users/templates/create.mdx index d5b98f2a6..6e7f7f2e6 100644 --- a/apps/docs/content/docs/users/templates/create.mdx +++ b/apps/docs/content/docs/users/templates/create.mdx @@ -135,7 +135,9 @@ Additional options that apply to all documents created from this template: ## Template Visibility -All templates are created in a team context. Team members can see, edit, delete, and use the templates in that team. See [Organisations](/docs/users/organisations) to learn about creating and managing organisations. +All templates are created in a team context. By default, templates are **Private** and only visible to members of the owning team. + +If your organisation has multiple teams, you can set a template's type to **Organisation** to share it across all teams. See [Organisation Templates](/docs/users/templates/organisation-templates) for details. --- diff --git a/apps/docs/content/docs/users/templates/index.mdx b/apps/docs/content/docs/users/templates/index.mdx index 61b1ba089..c01977d16 100644 --- a/apps/docs/content/docs/users/templates/index.mdx +++ b/apps/docs/content/docs/users/templates/index.mdx @@ -24,6 +24,11 @@ description: Create reusable document templates for common signing workflows. description="Create documents from your templates." href="/docs/users/templates/use" /> + --- diff --git a/apps/docs/content/docs/users/templates/meta.json b/apps/docs/content/docs/users/templates/meta.json index 23bec564d..f67c03acb 100644 --- a/apps/docs/content/docs/users/templates/meta.json +++ b/apps/docs/content/docs/users/templates/meta.json @@ -1,4 +1,4 @@ { "title": "Templates", - "pages": ["create", "use"] + "pages": ["create", "use", "organisation-templates"] } diff --git a/apps/docs/content/docs/users/templates/organisation-templates.mdx b/apps/docs/content/docs/users/templates/organisation-templates.mdx new file mode 100644 index 000000000..5e49e4e2c --- /dev/null +++ b/apps/docs/content/docs/users/templates/organisation-templates.mdx @@ -0,0 +1,131 @@ +--- +title: Organisation Templates +description: Share templates across all teams in your organisation so any team can create documents from them. +--- + +import { Callout } from 'fumadocs-ui/components/callout'; +import { Step, Steps } from 'fumadocs-ui/components/steps'; + +## Overview + +Organisation templates are templates shared across all teams within the same organisation. Any team in the organisation can browse and use them to create documents, but only the owning team can edit or delete them. + +This is useful when you have standardised documents that multiple teams need to use, such as company-wide NDAs, onboarding agreements, or compliance forms. + +## Requirements + +The Organisation template type is available when your organisation has **two or more teams**. If your organisation has only one team, the option does not appear. + +## Template Types + +| Type | Who can see it | Who can edit it | Who can use it | +| ---------------- | ------------------------- | ----------------- | --------------------------- | +| **Private** | Members of the owning team | Owning team | Owning team | +| **Organisation** | All teams in the org | Owning team only | All teams in the org | +| **Public** | Anyone with the link | Owning team | Anyone via direct link | + +## Set a Template as Organisation + +{/* prettier-ignore */} + + +### Open template settings + +Navigate to **Templates**, open the template you want to share, and click **Edit Template** to open the editor. Then open the settings dialog. + + + + +### Change the template type + +In the **Template type** dropdown, select **Organisation**. This option only appears if your organisation has at least two teams. + + + + +### Save + +Click **Save** to apply the change. The template is now visible to all teams in your organisation. + + + + +You can also set the template type to Organisation when creating a new template. The type dropdown appears in the template settings step. + +## Browse Organisation Templates + +{/* prettier-ignore */} + + +### Open the templates page + +Navigate to **Templates** in the sidebar. + + + + +### Switch to the Organisation tab + +Click the **Organisation** tab above the template list. This tab only appears for non-personal organisations. + +The Organisation tab shows all organisation templates from every team in your organisation, including your own. + + + + +Templates from other teams display the owning team's name next to the template type. + +## Use an Organisation Template + +Any team member in the organisation can create documents from an organisation template, even if the template belongs to a different team. + +{/* prettier-ignore */} + + + +Find the template in the **Organisation** tab or click through from the template detail page. + + + + + +Click **Use Template** and fill in the recipient details. The document is created under your team, not the template's owning team. + + + + +See [Use Templates](/docs/users/templates/use) for details on creating documents from templates. + +## Editing and Permissions + +Only members of the team that owns the template can edit or delete it. When viewing an organisation template from another team: + +- The **Edit Template**, **Direct Link**, and **Bulk Send** controls are hidden +- The recipients section is read-only +- The **Use Template** button is available + +To modify a template owned by another team, contact that team's members or ask an organisation admin to make changes. + +## Visibility + +Organisation templates respect the same visibility settings as other templates. A template's visibility determines which team roles can access it: + +| Visibility | Who can access | +| --------------------- | --------------------------------------- | +| **Everyone** | All team members (Admin, Manager, Member) | +| **Manager and above** | Admins and Managers only | +| **Admin** | Admins only | + +This applies to both the owning team and other teams in the organisation. A Member-role user on any team cannot see an organisation template set to Admin visibility. + +## Reverting to Private + +To stop sharing a template across the organisation, change the template type back to **Private** in the template settings. The template will only be visible to the owning team. Documents already created from the template are not affected. + +--- + +## See Also + +- [Create Templates](/docs/users/templates/create) - Build reusable templates +- [Use Templates](/docs/users/templates/use) - Create documents from templates +- [Organisations](/docs/users/organisations) - Managing organisations and teams diff --git a/apps/remix/app/components/general/envelope-editor/envelope-editor-header.tsx b/apps/remix/app/components/general/envelope-editor/envelope-editor-header.tsx index 5e9f60915..4eda2ae87 100644 --- a/apps/remix/app/components/general/envelope-editor/envelope-editor-header.tsx +++ b/apps/remix/app/components/general/envelope-editor/envelope-editor-header.tsx @@ -1,7 +1,8 @@ import { Trans, useLingui } from '@lingui/react/macro'; -import { DocumentStatus, EnvelopeType } from '@prisma/client'; +import { DocumentStatus, EnvelopeType, TemplateType } from '@prisma/client'; import { AlertTriangleIcon, + Building2Icon, Globe2Icon, LockIcon, RefreshCwIcon, @@ -94,12 +95,19 @@ export default function EnvelopeEditorHeader() { {envelope.type === EnvelopeType.TEMPLATE && ( <> - {envelope.templateType === 'PRIVATE' ? ( + {envelope.templateType === TemplateType.PRIVATE && ( Private Template - ) : ( + )} + {envelope.templateType === TemplateType.ORGANISATION && ( + + + Organisation Template + + )} + {envelope.templateType === TemplateType.PUBLIC && ( Public Template diff --git a/apps/remix/app/components/general/envelope-editor/envelope-editor-settings-dialog.tsx b/apps/remix/app/components/general/envelope-editor/envelope-editor-settings-dialog.tsx index 5f18db382..671cc83cf 100644 --- a/apps/remix/app/components/general/envelope-editor/envelope-editor-settings-dialog.tsx +++ b/apps/remix/app/components/general/envelope-editor/envelope-editor-settings-dialog.tsx @@ -9,6 +9,7 @@ import { DocumentVisibility, EnvelopeType, SendStatus, + TemplateType, } from '@prisma/client'; import type * as DialogPrimitive from '@radix-ui/react-dialog'; import { InfoIcon, MailIcon, SettingsIcon, ShieldIcon } from 'lucide-react'; @@ -66,6 +67,10 @@ import { DocumentVisibilityTooltip, } from '@documenso/ui/components/document/document-visibility-select'; import { ExpirationPeriodPicker } from '@documenso/ui/components/document/expiration-period-picker'; +import { + TemplateTypeSelect, + TemplateTypeTooltip, +} from '@documenso/ui/components/template/template-type-select'; import { cn } from '@documenso/ui/lib/utils'; import { Button } from '@documenso/ui/primitives/button'; import { CardDescription, CardHeader, CardTitle } from '@documenso/ui/primitives/card'; @@ -102,6 +107,7 @@ import { useToast } from '@documenso/ui/primitives/use-toast'; import { useCurrentTeam } from '~/providers/team'; export const ZAddSettingsFormSchema = z.object({ + templateType: z.nativeEnum(TemplateType).optional(), externalId: z.string().optional(), visibility: z.nativeEnum(DocumentVisibility).optional(), globalAccessAuth: z @@ -196,6 +202,7 @@ export const EnvelopeEditorSettingsDialog = ({ const createDefaultValues = () => { return { + templateType: envelope.templateType || TemplateType.PRIVATE, externalId: envelope.externalId || '', visibility: envelope.visibility || '', globalAccessAuth: documentAuthOption?.globalAccessAuth || [], @@ -270,6 +277,7 @@ export const EnvelopeEditorSettingsDialog = ({ try { await updateEnvelopeAsync({ data: { + templateType: envelope.type === EnvelopeType.TEMPLATE ? data.templateType : undefined, externalId: data.externalId || null, visibility: data.visibility, globalAccessAuth: parsedGlobalAccessAuth.success ? parsedGlobalAccessAuth.data : [], @@ -606,6 +614,31 @@ export const EnvelopeEditorSettingsDialog = ({ )} /> + {envelope.type === EnvelopeType.TEMPLATE && ( + ( + + + Template type + + + + + + + + )} + /> + )} + {settings.allowConfigureDistribution && ( { const { _ } = useLingui(); return ( -
+
-

+

Recipients

- - {recipients.length === 0 ? ( - - ) : ( - - )} - + {!readOnly && ( + + {recipients.length === 0 ? ( + + ) : ( + + )} + + )}
-
    +
      {recipients.length === 0 && (
    • No recipients @@ -60,13 +64,13 @@ export const TemplatePageViewRecipients = ({ } primaryText={ isTemplateRecipientEmailPlaceholder(recipient.email) ? ( -

      {recipient.name}

      +

      {recipient.name}

      ) : ( -

      {recipient.email}

      +

      {recipient.email}

      ) } secondaryText={ -

      +

      {_(RECIPIENT_ROLES_DESCRIPTION[recipient.role].roleName)}

      } diff --git a/apps/remix/app/components/general/template/template-type.tsx b/apps/remix/app/components/general/template/template-type.tsx index f1d2ec244..02ef11298 100644 --- a/apps/remix/app/components/general/template/template-type.tsx +++ b/apps/remix/app/components/general/template/template-type.tsx @@ -4,7 +4,7 @@ import type { MessageDescriptor } from '@lingui/core'; import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; import type { TemplateType as TemplateTypePrisma } from '@prisma/client'; -import { Globe2, Lock } from 'lucide-react'; +import { Building2, Globe2, Lock } from 'lucide-react'; import type { LucideIcon } from 'lucide-react/dist/lucide-react'; import { cn } from '@documenso/ui/lib/utils'; @@ -28,6 +28,11 @@ const TEMPLATE_TYPES: Record = { icon: Globe2, color: 'text-green-500 dark:text-green-300', }, + ORGANISATION: { + label: msg`Organisation`, + icon: Building2, + color: 'text-orange-500 dark:text-orange-300', + }, }; export type TemplateTypeProps = HTMLAttributes & { diff --git a/apps/remix/app/components/tables/templates-table-action-dropdown.tsx b/apps/remix/app/components/tables/templates-table-action-dropdown.tsx index 4ca675b8e..4464f4caf 100644 --- a/apps/remix/app/components/tables/templates-table-action-dropdown.tsx +++ b/apps/remix/app/components/tables/templates-table-action-dropdown.tsx @@ -5,7 +5,6 @@ import type { Recipient, TemplateDirectLink } from '@prisma/client'; import { Copy, Edit, FolderIcon, MoreHorizontal, Share2Icon, Trash2, Upload } from 'lucide-react'; import { Link } from 'react-router'; -import { useSession } from '@documenso/lib/client-only/providers/session'; import { DropdownMenu, DropdownMenuContent, @@ -42,76 +41,72 @@ export const TemplatesTableActionDropdown = ({ teamId, onDelete, }: TemplatesTableActionDropdownProps) => { - const { user } = useSession(); - const [isDeleteDialogOpen, setDeleteDialogOpen] = useState(false); const [isDuplicateDialogOpen, setDuplicateDialogOpen] = useState(false); const [isMoveToFolderDialogOpen, setMoveToFolderDialogOpen] = useState(false); - const isOwner = row.userId === user.id; const isTeamTemplate = row.teamId === teamId; + const canMutate = isTeamTemplate; const formatPath = `${templateRootPath}/${row.envelopeId}/edit`; return ( - + Action - + Edit - setDuplicateDialogOpen(true)} - > + setDuplicateDialogOpen(true)}> Duplicate - - - Direct link - - } - /> + {canMutate && ( + + + Direct link + + } + /> + )} - setMoveToFolderDialogOpen(true)}> + setMoveToFolderDialogOpen(true)}> Move to Folder - - - Bulk Send via CSV - - } - /> + {canMutate && ( + + + Bulk Send via CSV + + } + /> + )} - setDeleteDialogOpen(true)} - > + setDeleteDialogOpen(true)}> Delete diff --git a/apps/remix/app/components/tables/templates-table.tsx b/apps/remix/app/components/tables/templates-table.tsx index df7ef6dc1..46240d4ca 100644 --- a/apps/remix/app/components/tables/templates-table.tsx +++ b/apps/remix/app/components/tables/templates-table.tsx @@ -3,7 +3,15 @@ import { useMemo, useTransition } from 'react'; import { msg } from '@lingui/core/macro'; import { useLingui } from '@lingui/react'; import { Trans } from '@lingui/react/macro'; -import { AlertTriangle, Globe2Icon, InfoIcon, Link2Icon, Loader, LockIcon } from 'lucide-react'; +import { + AlertTriangle, + Building2Icon, + Globe2Icon, + InfoIcon, + Link2Icon, + Loader, + LockIcon, +} from 'lucide-react'; import { Link } from 'react-router'; import { useLimits } from '@documenso/ee/server-only/limits/provider/client'; @@ -166,25 +174,48 @@ export const TemplatesTable = ({ )}

      • +
    • +

      + + Organisation +

      + +

      + + Organisation templates are shared across all teams within the same + organisation. Only the owning team can edit them. + +

      +
    ), accessorKey: 'type', - cell: ({ row }) => ( -
    - + cell: ({ row }) => { + const isFromOtherTeam = row.original.teamId !== team?.id; - {row.original.directLink?.token && ( - - )} -
    - ), + return ( +
    + + + {isFromOtherTeam && row.original.team?.name && ( + + ({row.original.team.name}) + + )} + + {row.original.directLink?.token && ( + + )} +
    + ); + }, }, { header: _(msg`Actions`), diff --git a/apps/remix/app/root.tsx b/apps/remix/app/root.tsx index da7d281dc..47ebf0262 100644 --- a/apps/remix/app/root.tsx +++ b/apps/remix/app/root.tsx @@ -1,3 +1,4 @@ +import { NuqsAdapter } from 'nuqs/adapters/react-router/v7'; import { Links, Meta, @@ -138,15 +139,17 @@ export function LayoutContent({ children }: { children: React.ReactNode }) { )} */} - - - - {children} + + + + + {children} - - - - + + + + +