diff --git a/dev/tool/src/storage.ts b/dev/tool/src/storage.ts index 394cc4729f..3a76b25ea2 100644 --- a/dev/tool/src/storage.ts +++ b/dev/tool/src/storage.ts @@ -32,7 +32,7 @@ export async function syncFiles ( ): Promise { if (exAdapter.adapters === undefined) return - for (const [name, adapter] of exAdapter.adapters.entries()) { + for (const [name, adapter] of [...exAdapter.adapters.entries()].reverse()) { await adapter.make(ctx, workspaceId) await retryOnFailure(ctx, 5, async () => { @@ -47,7 +47,12 @@ export async function syncFiles ( for (const data of dataBulk) { const blob = await exAdapter.stat(ctx, workspaceId, data._id) - if (blob !== undefined) continue + if (blob !== undefined) { + if (blob.provider !== name && name === exAdapter.defaultAdapter) { + await exAdapter.syncBlobFromStorage(ctx, workspaceId, data._id, exAdapter.defaultAdapter) + } + continue + } await exAdapter.syncBlobFromStorage(ctx, workspaceId, data._id, name) @@ -167,6 +172,13 @@ async function processAdapter ( let targetBlob: Blob | ListBlobResult | undefined = targetBlobs.get(data._id) if (targetBlob !== undefined) { console.log('Target blob already exists', targetBlob._id) + + const aggrBlob = await exAdapter.stat(ctx, workspaceId, data._id) + if (aggrBlob === undefined || aggrBlob?.provider !== targetBlob.provider) { + targetBlob = await exAdapter.syncBlobFromStorage(ctx, workspaceId, targetBlob._id, exAdapter.defaultAdapter) + } + // We could safely delete source blob + toRemove.push(data._id) } if (targetBlob === undefined) { @@ -176,32 +188,28 @@ async function processAdapter ( console.error('blob not found', data._id) continue } - await rateLimiter.exec(async () => { + targetBlob = await rateLimiter.exec(async () => { try { - await retryOnFailure( + const result = await retryOnFailure( ctx, 5, async () => { await processFile(ctx, source, target, workspaceId, sourceBlob) // We need to sync and update aggregator table for now. - targetBlob = await exAdapter.syncBlobFromStorage( - ctx, - workspaceId, - sourceBlob._id, - exAdapter.defaultAdapter - ) + return await exAdapter.syncBlobFromStorage(ctx, workspaceId, sourceBlob._id, exAdapter.defaultAdapter) }, 50 ) movedCnt += 1 movedBytes += sourceBlob.size batchBytes += sourceBlob.size + return result } catch (err) { console.error('failed to process blob', data._id, err) } }) - if (targetBlob !== undefined && 'size' in targetBlob && (targetBlob as Blob).size === sourceBlob.size) { + if (targetBlob !== undefined) { // We could safely delete source blob toRemove.push(sourceBlob._id) } @@ -233,7 +241,10 @@ async function processAdapter ( await rateLimiter.waitProcessing() if (toRemove.length > 0 && params.move) { - await source.remove(ctx, workspaceId, toRemove) + while (toRemove.length > 0) { + const part = toRemove.splice(0, 500) + await source.remove(ctx, workspaceId, part) + } } } finally { await iterator.close() diff --git a/models/chunter/src/index.ts b/models/chunter/src/index.ts index 5f13dd5033..b8bb7da2ca 100644 --- a/models/chunter/src/index.ts +++ b/models/chunter/src/index.ts @@ -221,8 +221,12 @@ export function createModel (builder: Builder): void { builder.createDoc>(activity.class.ActivityMessageControl, core.space.Model, { objectClass: chunter.class.DirectMessage, - skip: [{ _class: core.class.TxMixin }, { _class: core.class.TxCreateDoc }, { _class: core.class.TxRemoveDoc }], - allowedFields: ['members'] + skip: [ + { _class: core.class.TxMixin }, + { _class: core.class.TxCreateDoc }, + { _class: core.class.TxRemoveDoc }, + { _class: core.class.TxUpdateDoc } + ] }) builder.createDoc(activity.class.DocUpdateMessageViewlet, core.space.Model, { @@ -241,16 +245,6 @@ export function createModel (builder: Builder): void { } }) - builder.createDoc(activity.class.DocUpdateMessageViewlet, core.space.Model, { - objectClass: chunter.class.DirectMessage, - action: 'update', - config: { - members: { - presenter: chunter.activity.MembersChangedMessage - } - } - }) - builder.mixin(chunter.class.ChatMessage, core.class.Class, activity.mixin.ActivityMessagePreview, { presenter: chunter.component.ChatMessagePreview }) diff --git a/models/chunter/src/migration.ts b/models/chunter/src/migration.ts index 14e1638d62..70d2c2151c 100644 --- a/models/chunter/src/migration.ts +++ b/models/chunter/src/migration.ts @@ -351,6 +351,17 @@ export const chunterOperation: MigrateOperation = { func: async (client) => { await removeDuplicatedDirects(client) } + }, + { + state: 'remove-direct-members-messages', + func: async (client) => { + await client.deleteMany(DOMAIN_ACTIVITY, { + _class: activity.class.DocUpdateMessage, + attachedToClass: chunter.class.DirectMessage, + action: 'update', + 'attributeUpdates.attrKey': 'members' + }) + } } ]) }, diff --git a/models/workbench/src/index.ts b/models/workbench/src/index.ts index 765e7e5d9c..6b669df82a 100644 --- a/models/workbench/src/index.ts +++ b/models/workbench/src/index.ts @@ -105,6 +105,7 @@ export class TTxSidebarEvent extends TTx implements TxSidebarEvent { @UX(workbench.string.Tab) export class TWorkbenchTab extends TPreference implements WorkbenchTab { location!: string + name?: string isPinned!: boolean } diff --git a/packages/presentation/src/components/markup/CodeBlockNode.svelte b/packages/presentation/src/components/markup/CodeBlockNode.svelte index a13bd4bba5..b2ae30276a 100644 --- a/packages/presentation/src/components/markup/CodeBlockNode.svelte +++ b/packages/presentation/src/components/markup/CodeBlockNode.svelte @@ -20,15 +20,16 @@ export let node: MarkupNode export let preview = false + const is = diffview.component.Highlight + $: language = node.attrs?.language $: content = node.content ?? [] $: value = content.map((node) => node.text).join('/n') + $: margin = preview ? '0' : null + + $: props = { value, language } {#if node} - 
-    
-      
-    
-
+
{/if} diff --git a/packages/ui/src/components/ModernTab.svelte b/packages/ui/src/components/ModernTab.svelte index e4949b263d..54054aafa3 100644 --- a/packages/ui/src/components/ModernTab.svelte +++ b/packages/ui/src/components/ModernTab.svelte @@ -73,9 +73,10 @@
dispatch('close')} />
- {:else} + {:else if $$slots.postfix === undefined}
{/if} +
diff --git a/plugins/notification-resources/src/components/NotifyMarker.svelte b/plugins/notification-resources/src/components/NotifyMarker.svelte index e4e5e19469..b9cf69670a 100644 --- a/plugins/notification-resources/src/components/NotifyMarker.svelte +++ b/plugins/notification-resources/src/components/NotifyMarker.svelte @@ -14,7 +14,7 @@ --> + + {#if tab.isPinned} + + {/if} + diff --git a/plugins/workbench-resources/src/workbench.ts b/plugins/workbench-resources/src/workbench.ts index 26215dfaf4..3e25961d0e 100644 --- a/plugins/workbench-resources/src/workbench.ts +++ b/plugins/workbench-resources/src/workbench.ts @@ -13,20 +13,26 @@ // limitations under the License. // import { derived, get, writable } from 'svelte/store' -import core, { concatLink, getCurrentAccount, type Ref } from '@hcengineering/core' -import workbench, { type WorkbenchTab } from '@hcengineering/workbench' +import core, { type Class, concatLink, type Doc, getCurrentAccount, type Ref } from '@hcengineering/core' +import { type Application, workbenchId, type WorkbenchTab } from '@hcengineering/workbench' import { location as locationStore, locationToUrl, parseLocation, type Location, navigate, - getCurrentLocation + getCurrentLocation, + languageStore, + type AnyComponent } from '@hcengineering/ui' import presentation, { getClient } from '@hcengineering/presentation' -import { getMetadata } from '@hcengineering/platform' +import view from '@hcengineering/view' +import { type Asset, type IntlString, getMetadata, getResource, translate } from '@hcengineering/platform' +import { parseLinkId } from '@hcengineering/view-resources' +import { notificationId } from '@hcengineering/notification' import { workspaceStore } from './utils' +import workbench from './plugin' export const tabIdStore = writable | undefined>() export const tabsStore = writable([]) @@ -38,7 +44,14 @@ workspaceStore.subscribe((workspace) => { tabIdStore.set(getTabFromLocalStorage(workspace ?? '')) }) -locationStore.subscribe((loc) => { +locationStore.subscribe(() => { + void syncTabLoc() +}) + +tabIdStore.subscribe(saveTabToLocalStorage) + +async function syncTabLoc (): Promise { + const loc = getCurrentLocation() const workspace = get(workspaceStore) if (workspace == null || workspace === '') return const tab = get(currentTabStore) @@ -51,11 +64,22 @@ locationStore.subscribe((loc) => { return } if (loc.path[2] === '' || loc.path[2] == null) return - void getClient().update(tab, { location: locationToUrl(loc) }) -}) - -tabIdStore.subscribe(saveTabToLocalStorage) + const data = await getTabDataByLocation(loc) + const name = data.name ?? (await translate(data.label, {}, get(languageStore))) + if (tab.name !== undefined && name !== tab.name && tab.isPinned) { + const me = getCurrentAccount() + const _id = await getClient().createDoc(workbench.class.WorkbenchTab, core.space.Workspace, { + location: locationToUrl(loc), + name, + attachedTo: me._id, + isPinned: false + }) + selectTab(_id) + } else { + await getClient().update(tab, { location: locationToUrl(loc), name }) + } +} export function syncWorkbenchTab (): void { const workspace = get(workspaceStore) tabIdStore.set(getTabFromLocalStorage(workspace ?? '')) @@ -90,7 +114,7 @@ export function selectTab (_id: Ref): void { tabIdStore.set(_id) } -export function getTabLocation (tab: WorkbenchTab): Location { +export function getTabLocation (tab: Pick): Location { const base = `${window.location.protocol}//${window.location.host}` const front = getMetadata(presentation.metadata.FrontUrl) ?? base const url = new URL(concatLink(front, tab.location)) @@ -120,13 +144,15 @@ export async function createTab (): Promise { const loc = getCurrentLocation() const client = getClient() const me = getCurrentAccount() + const defaultUrl = `${workbenchId}/${loc.path[1]}/${notificationId}` const tab = await client.createDoc(workbench.class.WorkbenchTab, core.space.Workspace, { attachedTo: me._id, - location: locationToUrl(loc), + location: defaultUrl, isPinned: false }) selectTab(tab) + navigate(getTabLocation({ location: defaultUrl })) } export function canCloseTab (tab: WorkbenchTab): boolean { @@ -143,3 +169,66 @@ export async function unpinTab (tab: WorkbenchTab): Promise { const client = getClient() await client.update(tab, { isPinned: false }) } + +export async function getTabDataByLocation (loc: Location): Promise<{ + name?: string + label: IntlString + icon?: Asset + iconComponent?: AnyComponent + iconProps?: Record +}> { + const client = getClient() + const appAlias = loc.path[2] + const application = client.getModel().findAllSync(workbench.class.Application, { alias: appAlias })[0] + + let name: string | undefined + let label: IntlString | undefined + let icon: Asset | undefined + let iconComponent: AnyComponent | undefined + let iconProps: Record | undefined + + if (application?.locationDataResolver != null) { + const resolver = await getResource(application.locationDataResolver) + const data = await resolver(loc) + name = data.name + label = data.nameIntl ?? application.label ?? workbench.string.Tab + iconComponent = data.iconComponent + icon = data.icon ?? application.icon + iconProps = data.iconProps + } else { + const special = loc.path[3] + const specialLabel = application?.navigatorModel?.specials?.find((s) => s.id === special)?.label + const resolvedLoc = await getResolvedLocation(loc, application) + name = await getDefaultTabName(resolvedLoc) + label = specialLabel ?? application?.label ?? workbench.string.Tab + icon = application?.icon + } + + return { name, label, icon, iconComponent, iconProps } +} + +async function getResolvedLocation (loc: Location, app?: Application): Promise { + if (app?.locationResolver === undefined) return loc + + const resolver = await getResource(app.locationResolver) + return (await resolver(loc))?.loc ?? loc +} + +async function getDefaultTabName (loc: Location): Promise { + if (loc.fragment == null) return + const client = getClient() + const hierarchy = client.getHierarchy() + const [, id, _class] = decodeURIComponent(loc.fragment).split('|') + if (_class == null) return + + const mixin = hierarchy.classHierarchyMixin(_class as Ref>, view.mixin.ObjectTitle) + if (mixin === undefined) return + const titleProvider = await getResource(mixin.titleProvider) + try { + const linkProviders = client.getModel().findAllSync(view.mixin.LinkIdProvider, {}) + const _id = await parseLinkId(linkProviders, id, _class as Ref>) + return await titleProvider(client, _id) + } catch (err: any) { + console.error(err) + } +} diff --git a/plugins/workbench/src/index.ts b/plugins/workbench/src/index.ts index 2bdf78decf..f22cdf0bb9 100644 --- a/plugins/workbench/src/index.ts +++ b/plugins/workbench/src/index.ts @@ -113,6 +113,7 @@ export interface TxSidebarEvent = Record 0 && syncToProject && target.prjData !== undefined) { const errors = await this.updateIssueValues(target, okit, fieldsUpdate) - if (errors.length > 0) { - return { externalVersion: '', needUpdate: githubSyncVersion, error: errors } + if (errors.length === 0) { + needExternalSync = true } - needExternalSync = true } // TODO: Add support for labels, milestone, assignees } diff --git a/services/github/pod-github/src/sync/pullrequests.ts b/services/github/pod-github/src/sync/pullrequests.ts index b8885f5809..8ef9fd275d 100644 --- a/services/github/pod-github/src/sync/pullrequests.ts +++ b/services/github/pod-github/src/sync/pullrequests.ts @@ -971,6 +971,10 @@ export class PullRequestSyncManager extends IssueSyncManagerBase implements DocS return { needSync: githubSyncVersion } } + if (info.repository == null) { + return { needSync: githubSyncVersion } + } + const pullRequestExternal = info.external as unknown as PullRequestExternalData if (info.externalVersion !== githubExternalSyncVersion) { diff --git a/services/github/pod-github/src/sync/repository.ts b/services/github/pod-github/src/sync/repository.ts index bafaf1d542..998cd08006 100644 --- a/services/github/pod-github/src/sync/repository.ts +++ b/services/github/pod-github/src/sync/repository.ts @@ -265,7 +265,14 @@ export class RepositorySyncMapper implements DocSyncManager { let allRepos: GithubIntegrationRepository[] = [...allRepositories] + const githubRepos: + | Repository + | Endpoints['GET /installation/repositories']['response']['data']['repositories'][0][] = [] for await (const { repository } of iterable) { + githubRepos.push(repository) + } + + for (const repository of githubRepos) { const integrationRepo: GithubIntegrationRepository | undefined = allRepos.find( (it) => it.repositoryId === repository.id ) @@ -325,13 +332,8 @@ export class RepositorySyncMapper implements DocSyncManager { // Ok we have repos removed from integration, we need to delete them. for (const repo of allRepos) { - await this.client.remove(repo) - const prj = projects.find((it) => it._id === repo.githubProject) - if (prj !== undefined) { - await this.client.update(prj, { - $pull: { repositories: repo._id } - }) - } + // Mark as archived + await this.client.update(repo, { archived: true }) } // We need to delete and disconnect missing repositories. diff --git a/services/github/pod-github/src/worker.ts b/services/github/pod-github/src/worker.ts index 473822d6bd..db5f974876 100644 --- a/services/github/pod-github/src/worker.ts +++ b/services/github/pod-github/src/worker.ts @@ -395,9 +395,6 @@ export class GithubWorker implements IntegrationManager { periodicSyncPromise: Promise | undefined async performPeriodicSync (): Promise { try { - for (const inst of this.integrations.values()) { - await this.repositoryManager.reloadRepositories(inst) - } this.triggerUpdate() } catch (err: any) { Analytics.handleError(err)