wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-05-29 03:21:13 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'develop' into staging-new

Browse Source 
Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
This commit is contained in:
Andrey Sobolev 2025-04-30 15:56:47 +07:00
commit d5d69e96e9
No known key found for this signature in database
GPG Key ID: BD80F68D68D8F7F2
6 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/tool/src/gmail.ts
View File

@ -184,7 +184,7 @@ async function migrateGmailHistory (
const history = db.collection<History>('histories') const history = db.collection<History>('histories')
const allHistories = await history.find({}).toArray() const allHistories = await history.find({}).toArray()
const kvsClient = getKvsClient(kvsUrl, token) const kvsClient = getKvsClient('gmail', kvsUrl, token)
for (const history of allHistories) { for (const history of allHistories) {
try { try {

13
models/core/src/migration.ts
View File

@ -267,7 +267,7 @@ async function processMigrateContentFor (
} }
} }
async function migrateBackupMixins (client: MigrationClient): Promise<void> { export async function migrateBackupMixins (client: MigrationClient): Promise<void> {
// Go via classes with domain and check if mixin exists and need to flush %hash% // Go via classes with domain and check if mixin exists and need to flush %hash%
const hierarchy = client.hierarchy const hierarchy = client.hierarchy
const curHash = Date.now().toString(16) // Current hash value const curHash = Date.now().toString(16) // Current hash value
@ -959,12 +959,13 @@ export const coreOperation: MigrateOperation = {
state: 'accounts-to-social-ids', state: 'accounts-to-social-ids',
mode: 'upgrade', mode: 'upgrade',
func: migrateAccounts func: migrateAccounts
},
{
state: 'migrate-backup-mixins',
mode: 'upgrade',
func: migrateBackupMixins
} }
// ,
// {
// state: 'migrate-backup-mixins',
// mode: 'upgrade',
// func: migrateBackupMixins
// }
]) ])
}, },
async upgrade (state: Map<string, Set<string>>, client: () => Promise<MigrationUpgradeClient>, mode): Promise<void> { async upgrade (state: Map<string, Set<string>>, client: () => Promise<MigrationUpgradeClient>, mode): Promise<void> {

2
plugins/love-resources/src/components/RoomPreview.svelte
View File

@ -89,7 +89,7 @@
e.stopPropagation() e.stopPropagation()
e.preventDefault() e.preventDefault()
if (person !== undefined) { if (person !== undefined) {
if ($myInfo === undefined) return if ($myInfo === undefined || (person._id === me && $myInfo?.room === room._id)) return
showPopup(PersonActionPopup, { room, person: person._id }, eventToHTMLElement(e)) showPopup(PersonActionPopup, { room, person: person._id }, eventToHTMLElement(e))
} else { } else {
await openRoom(x, y) await openRoom(x, y)

2
server/datalake/src/index.ts
View File

@ -118,7 +118,7 @@ export class DatalakeService implements StorageAdapter {
size: (typeof blob.size === 'string' ? parseInt(blob.size) : blob.size) ?? 0, size: (typeof blob.size === 'string' ? parseInt(blob.size) : blob.size) ?? 0,
provider: this.opt.name, provider: this.opt.name,
space: core.space.Configuration, space: core.space.Configuration,
modifiedBy: core.account.ConfigUser, modifiedBy: core.account.System,
modifiedOn: 0 modifiedOn: 0
}) })
} }

2
server/minio/src/index.ts
View File

@ -235,7 +235,7 @@ export class MinioService implements StorageAdapter {
size: data.size, size: data.size,
provider: this.opt.name, provider: this.opt.name,
space: core.space.Configuration, space: core.space.Configuration,
modifiedBy: core.account.ConfigUser, modifiedBy: core.account.System,
modifiedOn: data.lastModified.getTime() modifiedOn: data.lastModified.getTime()
}) })
} }

2
server/s3/src/index.ts
View File

@ -288,7 +288,7 @@ export class S3Service implements StorageAdapter {
size: data.Size ?? 0, size: data.Size ?? 0,
provider: this.opt.name, provider: this.opt.name,
space: core.space.Configuration, space: core.space.Configuration,
modifiedBy: core.account.ConfigUser, modifiedBy: core.account.System,
modifiedOn: data.LastModified?.getTime() ?? 0 modifiedOn: data.LastModified?.getTime() ?? 0
}) })
} }