diff --git a/app/menus/TemplatesMenu.tsx b/app/menus/TemplatesMenu.tsx index 15ad18b0ea..48e4e48e7b 100644 --- a/app/menus/TemplatesMenu.tsx +++ b/app/menus/TemplatesMenu.tsx @@ -48,11 +48,7 @@ function TemplatesMenu({ isCompact, onSelectTemplate, document }: Props) { [user, onSelectTemplate] ); - const publishedTemplates = templates.orderedData.filter( - (template) => template.publishedAt - ); - - const collectionItems = publishedTemplates + const collectionItems = templates.orderedData .filter( (template) => !template.isWorkspaceTemplate && @@ -60,7 +56,7 @@ function TemplatesMenu({ isCompact, onSelectTemplate, document }: Props) { ) .map(templateToMenuItem); - const workspaceTemplates = publishedTemplates + const workspaceTemplates = templates.orderedData .filter((template) => template.isWorkspaceTemplate) .map(templateToMenuItem); diff --git a/app/models/Template.ts b/app/models/Template.ts index 8f7174f326..0b41dbc93b 100644 --- a/app/models/Template.ts +++ b/app/models/Template.ts @@ -107,11 +107,6 @@ export default class Template extends ParanoidModel implements Searchable { return !!this.deletedAt; } - @computed - get isDraft(): boolean { - return !this.publishedAt; - } - @computed get hasEmptyTitle(): boolean { return this.title === ""; diff --git a/app/scenes/Settings/components/Template.tsx b/app/scenes/Settings/components/Template.tsx index 6ff18b005b..a8c9bd733c 100644 --- a/app/scenes/Settings/components/Template.tsx +++ b/app/scenes/Settings/components/Template.tsx @@ -62,7 +62,7 @@ export default function TemplateEdit({ template }: Props) { ) ); -allow(User, "publish", Template, (actor, template) => - and( - // - can(actor, "update", template), - !!template?.isDraft - ) -); - -allow(User, "unpublish", Template, (actor, template) => - and( - // - can(actor, "update", template), - !template?.isDraft - ) -); - allow(User, "delete", Template, (actor, template) => and( //