@things-factory/announcement 10.1.259 → 10.1.261

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/announcement",
-  "version": "10.1.259",
+  "version": "10.1.261",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -36,18 +36,18 @@
     "@operato/shell": "^10.29.69",
     "@operato/styles": "^10.29.1",
     "@operato/utils": "^10.0.0",
-    "@things-factory/ai-assistant": "^10.1.259",
-    "@things-factory/attachment-base": "^10.1.259",
-    "@things-factory/auth-base": "^10.1.259",
+    "@things-factory/ai-assistant": "^10.1.261",
+    "@things-factory/attachment-base": "^10.1.261",
+    "@things-factory/auth-base": "^10.1.261",
     "@things-factory/env": "^10.1.149",
-    "@things-factory/i18n-base": "^10.1.259",
-    "@things-factory/notification": "^10.1.259",
-    "@things-factory/organization": "^10.1.259",
-    "@things-factory/shell": "^10.1.259",
+    "@things-factory/i18n-base": "^10.1.261",
+    "@things-factory/notification": "^10.1.261",
+    "@things-factory/organization": "^10.1.261",
+    "@things-factory/shell": "^10.1.261",
     "graphql-scalars": "^1.22.0",
     "graphql-tag": "^2.12.6",
     "graphql-upload": "^15.0.2",
     "lit": "^3.1.2"
   },
-  "gitHead": "e7283779ee700b4b124226f0ad22d7c1e4063ae7"
+  "gitHead": "06537757f8708e6a511c6232e8792f18fdd6a986"
 }

package/server/service/announcement/announcement-service.ts

@@ -4,7 +4,7 @@
  */
 import { EntityManager, In, IsNull, LessThanOrEqual } from 'typeorm'
 
-import { checkPermission, User, UserStatus } from '@things-factory/auth-base'
+import { requestHolds, User, UserStatus } from '@things-factory/auth-base'
 import { logger } from '@things-factory/env'
 import { translatorFor } from '@things-factory/i18n-base/translator'
 import { keepNoticeDelivery, noticeDeliveryOf, noticeLinkOf, sendNotice, sendNoticeWhenCommitted, type Notice } from '@things-factory/notification'
@@ -19,12 +19,7 @@ export const ANNOUNCEMENT_REF_TYPE = 'Announcement'
 
 /** Whether the request writes announcements - the one privilege of the module (`announcement.writing`). */
 export async function isWriter(context: any): Promise<boolean> {
-  const state = context?.state ?? {}
-  const { domain, user, unsafeIP, prohibitedPrivileges } = state
-  if (!domain || !user) return false
-  /* Asked once per request - a list asks it for each row. */
-  state.__announcementWriter ??= checkPermission({ category: 'announcement', privilege: 'mutation', owner: true } as any, user, domain, unsafeIP, prohibitedPrivileges).then(Boolean)
-  return await state.__announcementWriter
+  return await requestHolds(context, 'announcement', 'mutation')
 }
 
 /** The request's person as an audience sees them - asked once per request. */

package/test/announcement-persistence.test.ts

@@ -107,7 +107,7 @@ beforeEach(async () => {
 })
 
 const ids = (...names: string[]) => names.map(name => people[name].id).sort()
-const contextOf = (who: string, writer = false) => ({ state: { domain, user: people[who], __announcementWriter: Promise.resolve(writer) } })
+const contextOf = (who: string, writer = false) => ({ state: { domain, user: people[who], __privilegesHeld: new Map([['announcement:mutation', Promise.resolve(writer)]]) } })
 
 async function draft(audiences: { scope: string; targetId: string }[], extra: any = {}) {
   const one = await dataSource.getRepository(Announcement).save({ domain, title: '연말 휴무', body: '**12월 31일** 휴무', status: 'DRAFT', creator: people.writer, ...extra })

package/test/list-query-state.test.ts

@@ -0,0 +1,25 @@
+/*
+ * The announcement list's query is its grid's - the period a filter of the grid, kept in the address with search and
+ * page (FOOTER-BUTTON-REVIEW G09), so a shared link, coming back and reloading read the same list.
+ */
+import { readFileSync } from 'fs'
+import { join } from 'path'
+
+import { announcementPeriodOf } from '../client/utils/announcement-list-query'
+
+const page = readFileSync(join(__dirname, '..', 'client', 'pages', 'announcement-list.ts'), 'utf8')
+
+test('★ the period is past only when the grid says so - none, or a cleared choice, is the current ones', () => {
+  expect(announcementPeriodOf([{ name: 'period', value: 'past' }])).toBe('past')
+  expect(announcementPeriodOf([{ name: 'period', value: 'current' }])).toBe('current')
+  expect(announcementPeriodOf([{ name: 'period', value: '' }])).toBe('current')
+  expect(announcementPeriodOf([{ name: 'category', value: 'past' }])).toBe('current')
+  expect(announcementPeriodOf(undefined)).toBe('current')
+})
+
+test('★ the list keeps its query in the address and narrows by the grid, never by a page choice that re-reads by hand', () => {
+  expect(page).toMatch(/\?url-params-sensitive=\$\{this\.active\}/)
+  expect(page).toMatch(/name: 'period',[\s\S]*?hidden: true,[\s\S]*?filter: \{[\s\S]*?value: 'current'/)
+  expect(page).not.toMatch(/@state\(\) period|ox-select|this\.grist\.fetch\(\)\s*\n\s*\}\}/)
+  expect(page).toMatch(/value: announcementPeriodOf\(filters\)/)
+})

package/translations/en.json

@@ -1,7 +1,7 @@
 {
   "announcement.title.list": "Announcements",
   "announcement.title.manage": "Manage announcements",
-  "announcement.title.new": "New announcement",
+  "announcement.title.new": "Write announcement",
   "announcement.title.edit": "Edit announcement",
   "announcement.title.view": "Announcement",
   "announcement.title.popup": "Announcements",
@@ -12,7 +12,7 @@
   "announcement.button.copy": "Copy",
   "announcement.button.delete": "Delete",
   "announcement.button.edit": "Edit",
-  "announcement.button.new": "New announcement",
+  "announcement.button.new": "Write announcement",
   "announcement.button.next": "Next",
   "announcement.button.open": "Open",
   "announcement.button.previous": "Previous",
@@ -93,7 +93,7 @@
   "announcement.text.link-label": "Name",
   "announcement.text.link-url": "Address",
   "announcement.text.manage-empty": "No announcements.",
-  "announcement.text.manage-empty-description": "Write one with \"New announcement\".",
+  "announcement.text.manage-empty-description": "Press Write announcement to write one.",
   "announcement.text.markdown-hint": "Markdown: **bold**, - list, [link](address)",
   "announcement.text.new-version": "Saving makes version {version}.",
   "announcement.text.no-audience": "No audience yet.",

package/translations/es.json

@@ -1,7 +1,7 @@
 {
   "announcement.title.list": "Avisos",
   "announcement.title.manage": "Gestionar avisos",
-  "announcement.title.new": "Nuevo aviso",
+  "announcement.title.new": "Redactar aviso",
   "announcement.title.edit": "Editar aviso",
   "announcement.title.view": "Aviso",
   "announcement.title.popup": "Avisos",
@@ -12,7 +12,7 @@
   "announcement.button.copy": "Copiar",
   "announcement.button.delete": "Eliminar",
   "announcement.button.edit": "Editar",
-  "announcement.button.new": "Nuevo aviso",
+  "announcement.button.new": "Redactar aviso",
   "announcement.button.next": "Siguiente",
   "announcement.button.open": "Abrir",
   "announcement.button.previous": "Anterior",
@@ -93,7 +93,7 @@
   "announcement.text.link-label": "Nombre",
   "announcement.text.link-url": "Dirección",
   "announcement.text.manage-empty": "No hay avisos.",
-  "announcement.text.manage-empty-description": "Escribe uno con «Nuevo aviso».",
+  "announcement.text.manage-empty-description": "Pulse Redactar aviso para redactar uno.",
   "announcement.text.markdown-hint": "Markdown: **negrita**, - lista, [enlace](dirección)",
   "announcement.text.new-version": "Al guardar será la versión {version}.",
   "announcement.text.no-audience": "Aún sin destinatarios.",

package/translations/ja.json

@@ -1,7 +1,7 @@
 {
   "announcement.title.list": "お知らせ",
   "announcement.title.manage": "お知らせ管理",
-  "announcement.title.new": "新規お知らせ",
+  "announcement.title.new": "お知らせを作成",
   "announcement.title.edit": "お知らせ編集",
   "announcement.title.view": "お知らせ",
   "announcement.title.popup": "お知らせ",
@@ -12,7 +12,7 @@
   "announcement.button.copy": "複製",
   "announcement.button.delete": "削除",
   "announcement.button.edit": "編集",
-  "announcement.button.new": "新規お知らせ",
+  "announcement.button.new": "お知らせを作成",
   "announcement.button.next": "次へ",
   "announcement.button.open": "詳細",
   "announcement.button.previous": "前へ",
@@ -93,7 +93,7 @@
   "announcement.text.link-label": "名前",
   "announcement.text.link-url": "アドレス",
   "announcement.text.manage-empty": "お知らせはありません。",
-  "announcement.text.manage-empty-description": "「新規お知らせ」で作成します。",
+  "announcement.text.manage-empty-description": "「お知らせを作成」を押して作成してください。",
   "announcement.text.markdown-hint": "Markdown: **太字**, - リスト, [リンク](アドレス)",
   "announcement.text.new-version": "保存すると第{version}版になります。",
   "announcement.text.no-audience": "宛先が指定されていません。",

package/translations/ko.json

@@ -1,7 +1,7 @@
 {
   "announcement.title.list": "공지사항",
   "announcement.title.manage": "공지 관리",
-  "announcement.title.new": "새 공지",
+  "announcement.title.new": "공지 작성",
   "announcement.title.edit": "공지 수정",
   "announcement.title.view": "공지사항",
   "announcement.title.popup": "공지사항",
@@ -12,7 +12,7 @@
   "announcement.button.copy": "복제",
   "announcement.button.delete": "삭제",
   "announcement.button.edit": "수정",
-  "announcement.button.new": "새 공지",
+  "announcement.button.new": "공지 작성",
   "announcement.button.next": "다음",
   "announcement.button.open": "자세히 보기",
   "announcement.button.previous": "이전",
@@ -93,7 +93,7 @@
   "announcement.text.link-label": "이름",
   "announcement.text.link-url": "주소",
   "announcement.text.manage-empty": "공지가 없습니다.",
-  "announcement.text.manage-empty-description": "「새 공지」로 작성합니다.",
+  "announcement.text.manage-empty-description": "「공지 작성」을 눌러 공지를 작성하세요.",
   "announcement.text.markdown-hint": "마크다운: **굵게**, - 목록, [링크](주소)",
   "announcement.text.new-version": "저장하면 {version} 버전이 됩니다.",
   "announcement.text.no-audience": "받는 사람을 지정하지 않았습니다.",

package/translations/ms.json

@@ -1,7 +1,7 @@
 {
   "announcement.title.list": "Pengumuman",
   "announcement.title.manage": "Urus pengumuman",
-  "announcement.title.new": "Pengumuman baharu",
+  "announcement.title.new": "Tulis pengumuman",
   "announcement.title.edit": "Sunting pengumuman",
   "announcement.title.view": "Pengumuman",
   "announcement.title.popup": "Pengumuman",
@@ -12,7 +12,7 @@
   "announcement.button.copy": "Salin",
   "announcement.button.delete": "Padam",
   "announcement.button.edit": "Sunting",
-  "announcement.button.new": "Pengumuman baharu",
+  "announcement.button.new": "Tulis pengumuman",
   "announcement.button.next": "Seterusnya",
   "announcement.button.open": "Buka",
   "announcement.button.previous": "Sebelumnya",
@@ -93,7 +93,7 @@
   "announcement.text.link-label": "Nama",
   "announcement.text.link-url": "Alamat",
   "announcement.text.manage-empty": "Tiada pengumuman.",
-  "announcement.text.manage-empty-description": "Tulis dengan \"Pengumuman baharu\".",
+  "announcement.text.manage-empty-description": "Tekan Tulis pengumuman untuk menulisnya.",
   "announcement.text.markdown-hint": "Markdown: **tebal**, - senarai, [pautan](alamat)",
   "announcement.text.new-version": "Simpan menjadikannya versi {version}.",
   "announcement.text.no-audience": "Belum ada penerima.",

package/translations/zh.json

@@ -1,7 +1,7 @@
 {
   "announcement.title.list": "公告",
   "announcement.title.manage": "公告管理",
-  "announcement.title.new": "新公告",
+  "announcement.title.new": "撰写公告",
   "announcement.title.edit": "编辑公告",
   "announcement.title.view": "公告",
   "announcement.title.popup": "公告",
@@ -12,7 +12,7 @@
   "announcement.button.copy": "复制",
   "announcement.button.delete": "删除",
   "announcement.button.edit": "编辑",
-  "announcement.button.new": "新公告",
+  "announcement.button.new": "撰写公告",
   "announcement.button.next": "下一条",
   "announcement.button.open": "查看详情",
   "announcement.button.previous": "上一条",
@@ -93,7 +93,7 @@
   "announcement.text.link-label": "名称",
   "announcement.text.link-url": "地址",
   "announcement.text.manage-empty": "没有公告。",
-  "announcement.text.manage-empty-description": "通过“新公告”撰写。",
+  "announcement.text.manage-empty-description": "请点击“撰写公告”撰写公告。",
   "announcement.text.markdown-hint": "Markdown:**加粗**、- 列表、[链接](地址)",
   "announcement.text.new-version": "保存后成为第 {version} 版。",
   "announcement.text.no-audience": "尚未指定接收人。",