Commit b7c3cfd

committed

ui(pages): reflect permanent deletions on group and page titles

1 parent 93c9e55 commit b7c3cfdCopy full SHA for b7c3cfd

File tree

3 files changed

+75

-0

lines changed

apps/client/src/code/pages/computed

3 files changed

+75

-0

lines changed

`‎apps/client/src/code/pages/computed/group-names.ts`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,21 @@ export const groupNames = once(() =>`
`26`	`26`	`return { status: 'success', text: 'Personal group' };`
`27`	`27`	`}`
`28`	`28`
	`29`	`+ const groupPermanentDeletionDate = internals.realtime.globalCtx.hget(`
	`30`	`+ 'group',`
	`31`	`+ groupId,`
	`32`	`+ 'permanent-deletion-date',`
	`33`	`+ );`
	`34`	`+`
	`35`	`+ if (`
	`36`	`+ groupPermanentDeletionDate != null &&`
	`37`	`+ groupPermanentDeletionDate < new Date()`
	`38`	`+ ) {`
	`39`	+ _getLogger.info(`${groupId}: Group is permanently deleted`);
	`40`	`+`
	`41`	+ return { status: 'unknown', text: `[Group ${groupId}]` };
	`42`	`+ }`
	`43`	`+`
`29`	`44`	`const [accessKeyring, groupEncryptedName] = await Promise.all([`
`30`	`45`	`groupAccessKeyrings()(groupId!).getAsync(),`
`31`	`46`

`‎apps/client/src/code/pages/computed/page-absolute-titles.ts`

Lines changed: 30 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,20 +30,50 @@ export const pageAbsoluteTitles = once(() =>`
`30`	`30`	`'encrypted-absolute-title',`
`31`	`31`	`);`
`32`	`32`
	`33`	`+ const pagePermanentDeletionDate = internals.realtime.globalCtx.hget(`
	`34`	`+ 'page',`
	`35`	`+ pageId,`
	`36`	`+ 'permanent-deletion-date',`
	`37`	`+ );`
	`38`	`+`
`33`	`39`	`const groupId = pageGroupIds()(pageId).get();`
`34`	`40`
	`41`	`+ const groupPermanentDeletionDate = internals.realtime.globalCtx.hget(`
	`42`	`+ 'group',`
	`43`	`+ groupId,`
	`44`	`+ 'permanent-deletion-date',`
	`45`	`+ );`
	`46`	`+`
`35`	`47`	`if (pageEncryptedAbsoluteTitle == null) {`
`36`	`48`	_getLogger.info(`${pageId}: No encrypted page title found`);
`37`	`49`
`38`	`50`	return { text: `[Page ${pageId}]`, status: 'unknown' };
`39`	`51`	`}`
`40`	`52`
	`53`	`+ if (`
	`54`	`+ pagePermanentDeletionDate != null &&`
	`55`	`+ pagePermanentDeletionDate < new Date()`
	`56`	`+ ) {`
	`57`	+ _getLogger.info(`${pageId}: Page is permanently deleted`);
	`58`	`+`
	`59`	+ return { text: `[Page ${pageId}]`, status: 'unknown' };
	`60`	`+ }`
	`61`	`+`
`41`	`62`	`if (groupId == null) {`
`42`	`63`	mainLogger.info(`${pageId}: No group ID found`);
`43`	`64`
`44`	`65`	return { text: `[Page ${pageId}]`, status: 'unknown' };
`45`	`66`	`}`
`46`	`67`
	`68`	`+ if (`
	`69`	`+ groupPermanentDeletionDate != null &&`
	`70`	`+ groupPermanentDeletionDate < new Date()`
	`71`	`+ ) {`
	`72`	+ _getLogger.info(`${pageId}: Group is permanently deleted`);
	`73`	`+`
	`74`	+ return { text: `[Page ${pageId}]`, status: 'unknown' };
	`75`	`+ }`
	`76`	`+`
`47`	`77`	const pageKeyring = pageKeyrings()(`${groupId}:${pageId}`).get();
`48`	`78`
`49`	`79`	`if (pageKeyring?.topLayer !== DataLayer.Raw) {`

`‎apps/client/src/code/pages/computed/page-relative-titles.ts`

Lines changed: 30 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,20 +30,50 @@ export const pageRelativeTitles = once(() =>`
`30`	`30`	`'encrypted-relative-title',`
`31`	`31`	`);`
`32`	`32`
	`33`	`+ const pagePermanentDeletionDate = internals.realtime.globalCtx.hget(`
	`34`	`+ 'page',`
	`35`	`+ pageId,`
	`36`	`+ 'permanent-deletion-date',`
	`37`	`+ );`
	`38`	`+`
`33`	`39`	`const groupId = pageGroupIds()(pageId).get();`
`34`	`40`
	`41`	`+ const groupPermanentDeletionDate = internals.realtime.globalCtx.hget(`
	`42`	`+ 'group',`
	`43`	`+ groupId,`
	`44`	`+ 'permanent-deletion-date',`
	`45`	`+ );`
	`46`	`+`
`35`	`47`	`if (pageEncryptedRelativeTitle == null) {`
`36`	`48`	_getLogger.info(`${pageId}: No encrypted page title found`);
`37`	`49`
`38`	`50`	return { text: `[Page ${pageId}]`, status: 'unknown' };
`39`	`51`	`}`
`40`	`52`
	`53`	`+ if (`
	`54`	`+ pagePermanentDeletionDate != null &&`
	`55`	`+ pagePermanentDeletionDate < new Date()`
	`56`	`+ ) {`
	`57`	+ _getLogger.info(`${pageId}: Page is permanently deleted`);
	`58`	`+`
	`59`	+ return { text: `[Page ${pageId}]`, status: 'unknown' };
	`60`	`+ }`
	`61`	`+`
`41`	`62`	`if (groupId == null) {`
`42`	`63`	mainLogger.info(`${pageId}: No group ID found`);
`43`	`64`
`44`	`65`	return { text: `[Page ${pageId}]`, status: 'unknown' };
`45`	`66`	`}`
`46`	`67`
	`68`	`+ if (`
	`69`	`+ groupPermanentDeletionDate != null &&`
	`70`	`+ groupPermanentDeletionDate < new Date()`
	`71`	`+ ) {`
	`72`	+ _getLogger.info(`${pageId}: Group is permanently deleted`);
	`73`	`+`
	`74`	+ return { text: `[Page ${pageId}]`, status: 'unknown' };
	`75`	`+ }`
	`76`	`+`
`47`	`77`	const pageKeyring = pageKeyrings()(`${groupId}:${pageId}`).get();
`48`	`78`
`49`	`79`	`if (pageKeyring?.topLayer !== DataLayer.Raw) {`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit b7c3cfd

File tree

3 files changed

3 files changed

`‎apps/client/src/code/pages/computed/group-names.ts`

`‎apps/client/src/code/pages/computed/page-absolute-titles.ts`

`‎apps/client/src/code/pages/computed/page-relative-titles.ts`

0 commit comments