hcengineering · BykhovDenis · Aug 22, 2024 · Apr 25, 2024 · Apr 25, 2024 · May 2, 2024
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -243,6 +243,7 @@ jobs:
           docker logs $(docker ps | grep transactor | cut -f 1 -d ' ') > logs/transactor.log
           docker logs $(docker ps | grep account | cut -f 1 -d ' ') > logs/account.log
           docker logs $(docker ps | grep front | cut -f 1 -d ' ') > logs/front.log
+          docker logs $(docker ps | grep collaborator | cut -f 1 -d ' ') > logs/collaborator.log
       - name: Upload test results
         if: always()
         uses: actions/upload-artifact@v4
@@ -438,6 +439,7 @@ jobs:
           docker logs $(docker ps | grep transactor | cut -f 1 -d ' ') > logs/uweb-transactor.log
           docker logs $(docker ps | grep account | cut -f 1 -d ' ') > logs/uweb-account.log
           docker logs $(docker ps | grep front | cut -f 1 -d ' ') > logs/uweb-front.log
+          docker logs $(docker ps | grep collaborator | cut -f 1 -d ' ') > logs/uweb-collaborator.log
       - name: Upload test results
         if: always()
         uses: actions/upload-artifact@v4

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -43,7 +43,6 @@
         "SERVER_SECRET": "secret",
         "ENABLE_CONSOLE": "true",
         "COLLABORATOR_URL": "ws://localhost:3078",
-        "COLLABORATOR_API_URL": "http://localhost:3078",
         "REKONI_URL": "http://localhost:4004",
         "FRONT_URL": "http://localhost:8080",
         "ACCOUNTS_URL": "http://localhost:3000",
@@ -104,7 +103,6 @@
         "UPLOAD_URL": "/files",
         "SERVER_PORT": "8087",
         "COLLABORATOR_URL": "ws://localhost:3078",
-        "COLLABORATOR_API_URL": "http://localhost:3078",
         "CALENDAR_URL": "http://localhost:8095",
         "GMAIL_URL": "http://localhost:8088",
         "TELEGRAM_URL": "http://localhost:8086",
@@ -239,7 +237,7 @@
         "CLIENT_ID": "${env:POD_GITHUB_CLIENTID}",
         "CLIENT_SECRET": "${env:POD_GITHUB_CLIENT_SECRET}",
         "PRIVATE_KEY": "${env:POD_GITHUB_PRIVATE_KEY}",
-        "COLLABORATOR_API_URL": "http://localhost:3078",
+        "COLLABORATOR_URL": "ws://localhost:3078",
         "SYSTEM_EMAIL": "[email protected]",
         "MINIO_ENDPOINT": "localhost",
         "MINIO_ACCESS_KEY": "minioadmin",
@@ -280,7 +278,7 @@
       "env": {
         "SERVER_SECRET": "secret",
         "ACCOUNTS_URL": "http://localhost:3000",
-        "COLLABORATOR_API_URL": "http://localhost:3078",
+        "COLLABORATOR_URL": "ws://localhost:3078",
         "STORAGE_CONFIG": "minio|localhost?accessKey=minioadmin&secretKey=minioadmin",
         "MONGO_URL": "mongodb://localhost:27017"
       },

diff --git a/desktop/src/ui/platform.ts b/desktop/src/ui/platform.ts
@@ -203,7 +203,6 @@ export async function configurePlatform (): Promise<void> {
   setMetadata(presentation.metadata.UploadURL, config.UPLOAD_URL)
   setMetadata(presentation.metadata.FilesURL, config.FILES_URL)
   setMetadata(presentation.metadata.CollaboratorUrl, config.COLLABORATOR_URL)
-  setMetadata(presentation.metadata.CollaboratorApiUrl, config.COLLABORATOR_API_URL)
   setMetadata(presentation.metadata.PreviewConfig, parsePreviewConfig(config.PREVIEW_CONFIG))
   setMetadata(presentation.metadata.FrontUrl, config.FRONT_URL)
 

diff --git a/desktop/src/ui/types.ts b/desktop/src/ui/types.ts
@@ -6,7 +6,6 @@ import { ScreenSource } from '@hcengineering/love'
 export interface Config {
   ACCOUNTS_URL: string
   COLLABORATOR_URL: string
-  COLLABORATOR_API_URL: string
   FRONT_URL: string
   FILES_URL: string
   UPLOAD_URL: string

diff --git a/dev/doc-import-tool/package.json b/dev/doc-import-tool/package.json
@@ -15,7 +15,7 @@
     "build:watch": "compile",
     "_phase:bundle": "rushx bundle",
     "bundle": "mkdir -p bundle && node esbuild.js",
-    "run-local": "cross-env SERVER_SECRET=secret MONGO_URL=mongodb://localhost:27017 COLLABORATOR_URL=ws://localhost:3078 COLLABORATOR_API_URL=http://localhost:3078 STORAGE_CONFIG=minio|minio?accessKey=minioadmin&secretKey=minioadmin PRODUCT_ID=ezqms node --nolazy -r ts-node/register ./src/__start.ts",
+    "run-local": "cross-env SERVER_SECRET=secret MONGO_URL=mongodb://localhost:27017 COLLABORATOR_URL=ws://localhost:3078 STORAGE_CONFIG=minio|minio?accessKey=minioadmin&secretKey=minioadmin PRODUCT_ID=ezqms node --nolazy -r ts-node/register ./src/__start.ts",
     "run": "cross-env node -r ts-node/register --max-old-space-size=8000 ./src/__start.ts",
     "format": "format src",
     "test": "jest --passWithNoTests --silent",

diff --git a/dev/doc-import-tool/src/config.ts b/dev/doc-import-tool/src/config.ts
@@ -8,7 +8,7 @@ import { HtmlConversionBackend } from './convert/convert'
 export interface Config {
   doc: string
   token: string
-  collaboratorApiURL: string
+  collaboratorURL: string
   uploadURL: string
   workspaceId: WorkspaceId
   owner: Ref<Employee>

diff --git a/dev/doc-import-tool/src/import.ts b/dev/doc-import-tool/src/import.ts
@@ -21,7 +21,7 @@ import core, {
   Ref,
   TxOperations,
   generateId,
-  getCollaborativeDoc,
+  makeCollaborativeDoc,
   systemAccountEmail,
   type Blob
 } from '@hcengineering/core'
@@ -100,7 +100,7 @@ async function createDocument (
     abstract: '',
     effectiveDate: 0,
     reviewInterval: DEFAULT_PERIODIC_REVIEW_INTERVAL,
-    content: getCollaborativeDoc(generateId()),
+    content: makeCollaborativeDoc(generateId()),
     snapshots: 0,
     plannedEffectiveDate: 0
   }
@@ -168,7 +168,7 @@ async function createTemplateIfNotExist (
     approvers: [],
     coAuthors: [],
     changeControl: ccRecordId,
-    content: getCollaborativeDoc(generateId()),
+    content: makeCollaborativeDoc(generateId()),
     snapshots: 0,
     plannedEffectiveDate: 0
   }
@@ -208,8 +208,8 @@ async function createSections (
     throw new Error(`Invalid document: ${JSON.stringify(doc)}`)
   }
 
-  const { collaboratorApiURL, token, workspaceId } = config
-  const collaborator = getCollaboratorClient(txops.getHierarchy(), workspaceId, token, collaboratorApiURL)
+  const { collaboratorURL, token, workspaceId } = config
+  const collaborator = getCollaboratorClient(workspaceId, token, collaboratorURL)
 
   console.log('Creating document content')
 
@@ -229,7 +229,7 @@ async function createSections (
       content += `<h1>${section.title}</h1>${section.content}`
     }
 
-    await collaborator.updateContent(collabId, 'content', content)
+    await collaborator.updateContent(collabId, { content })
   } finally {
     // do nothing
   }

diff --git a/dev/doc-import-tool/src/index.ts b/dev/doc-import-tool/src/index.ts
@@ -44,8 +44,8 @@ export function docImportTool (): void {
     process.exit(1)
   }
 
-  const collaboratorApiUrl = process.env.COLLABORATOR_API_URL
-  if (collaboratorApiUrl === undefined) {
+  const collaboratorUrl = process.env.COLLABORATOR_URL
+  if (collaboratorUrl === undefined) {
     console.error('please provide collaborator url')
     process.exit(1)
   }
@@ -104,7 +104,7 @@ export function docImportTool (): void {
             space: cmd.space,
             uploadURL: uploadUrl,
             storageAdapter,
-            collaboratorApiURL: collaboratorApiUrl,
+            collaboratorURL: collaboratorUrl,
             token: generateToken(systemAccountEmail, workspaceId)
           }
 

diff --git a/dev/docker-compose.yaml b/dev/docker-compose.yaml
@@ -106,7 +106,6 @@ services:
       - TELEGRAM_URL=http://localhost:8086
       - REKONI_URL=http://localhost:4004
       - COLLABORATOR_URL=ws://localhost:3078
-      - COLLABORATOR_API_URL=http://localhost:3078
       - STORAGE_CONFIG=${STORAGE_CONFIG}
       - GITHUB_URL=http://localhost:3500
       - PRINT_URL=http://localhost:4005

diff --git a/dev/local-mongo/docker-compose.yaml b/dev/local-mongo/docker-compose.yaml
@@ -93,7 +93,6 @@ services:
       - TELEGRAM_URL=http://localhost:8086
       - REKONI_URL=http://localhost:4004
       - COLLABORATOR_URL=ws://localhost:3078
-      - COLLABORATOR_API_URL=http://localhost:3078
       - STORAGE_CONFIG=${STORAGE_CONFIG}
       - GITHUB_URL=http://localhost:3500
       - PRINT_URL=http://localhost:4005

diff --git a/dev/prod/.env b/dev/prod/.env
@@ -5,9 +5,8 @@ FRONT_URL=http://localhost:8080
 REKONI_URL=http://localhost:4004
 
 COLLABORATOR_URL=ws://locahost:3078
-COLLABORATOR_API_URL=http://locahost:3078
 
 PRINT_URL=http://localhost:4005
 SIGN_URL=http://localhost:4006
 
-ANALYTICS_COLLECTOR_URL=http://localhost:4007
+ANALYTICS_COLLECTOR_URL=http://localhost:4007
diff --git a/dev/prod/config.json b/dev/prod/config.json
@@ -1,7 +1,6 @@
 {
   "ACCOUNTS_URL":"http://localhost:3000",
   "COLLABORATOR_URL": "ws://localhost:3078",
-  "COLLABORATOR_API_URL": "http://localhost:3078",
   "UPLOAD_URL":"/files",
   "REKONI_URL": "http://localhost:4004",
   "PRINT_URL": "http://localhost:4005",

diff --git a/dev/prod/public/config-dev.json b/dev/prod/public/config-dev.json
@@ -6,6 +6,5 @@
   "GMAIL_URL": "https://gmail.hc.engineering",
   "CALENDAR_URL": "https://calendar.hc.engineering",
   "REKONI_URL": "https://rekoni.hc.engineering",
-  "COLLABORATOR_URL": "wss://collaborator.hc.engineering",
-  "COLLABORATOR_API_URL": "https://collaborator.hc.engineering"
+  "COLLABORATOR_URL": "wss://collaborator.hc.engineering"
 }
diff --git a/dev/prod/public/config.json b/dev/prod/public/config.json
@@ -1,7 +1,6 @@
 {
   "ACCOUNTS_URL":"/account",
   "COLLABORATOR_URL": "ws://localhost:3078",
-  "COLLABORATOR_API_URL": "http://localhost:3078",
   "UPLOAD_URL":"/files",
   "TELEGRAM_URL": "http://localhost:8086",
   "GMAIL_URL": "http://localhost:8088",

diff --git a/dev/prod/src/platform.ts b/dev/prod/src/platform.ts
@@ -124,7 +124,6 @@ export interface Config {
   MODEL_VERSION: string
   VERSION: string
   COLLABORATOR_URL: string
-  COLLABORATOR_API_URL: string
   REKONI_URL: string
   TELEGRAM_URL: string
   GMAIL_URL: string
@@ -288,7 +287,6 @@ export async function configurePlatform() {
   setMetadata(presentation.metadata.FilesURL, config.FILES_URL)
   setMetadata(presentation.metadata.UploadURL, config.UPLOAD_URL)
   setMetadata(presentation.metadata.CollaboratorUrl, config.COLLABORATOR_URL)
-  setMetadata(presentation.metadata.CollaboratorApiUrl, config.COLLABORATOR_API_URL)
 
   setMetadata(presentation.metadata.FrontUrl, config.FRONT_URL)
   setMetadata(presentation.metadata.PreviewConfig, parsePreviewConfig(config.PREVIEW_CONFIG))

diff --git a/dev/tool/src/clean.ts b/dev/tool/src/clean.ts
@@ -1214,10 +1214,6 @@ async function updateId (
             const markup = (contentDoc as any)[attrName] as Markup
             const newMarkup = markup.replaceAll(doc._id, newId)
             await update(h, db, contentDoc, { [attrName]: newMarkup })
-          } else if (attr.type._class === core.class.TypeCollaborativeMarkup) {
-            const markup = (contentDoc as any)[attrName]
-            const newMarkup = markup.replaceAll(doc._id, newId)
-            await update(h, db, contentDoc, { [attrName]: newMarkup })
           } else if (attr.type._class === core.class.TypeCollaborativeDoc) {
             const collaborativeDoc = (contentDoc as any)[attr.name] as CollaborativeDoc
             await updateYDoc(ctx, collaborativeDoc, storage, workspaceId, contentDoc, newId, doc)

diff --git a/dev/tool/src/markup.ts b/dev/tool/src/markup.ts
@@ -7,7 +7,7 @@ import core, {
   type MeasureContext,
   type Ref,
   type WorkspaceId,
-  getCollaborativeDocId
+  makeCollaborativeDoc
 } from '@hcengineering/core'
 import { getMongoClient, getWorkspaceDB } from '@hcengineering/mongo'
 import { type StorageAdapter } from '@hcengineering/server-core'
@@ -39,10 +39,7 @@ export async function fixJsonMarkup (
 
       const attributes = hierarchy.getAllAttributes(_class)
       const filtered = Array.from(attributes.values()).filter((attribute) => {
-        return (
-          hierarchy.isDerived(attribute.type._class, core.class.TypeMarkup) ||
-          hierarchy.isDerived(attribute.type._class, core.class.TypeCollaborativeMarkup)
-        )
+        return hierarchy.isDerived(attribute.type._class, core.class.TypeMarkup)
       })
       if (filtered.length === 0) continue
 
@@ -88,7 +85,7 @@ async function processFixJsonMarkupFor (
           }
           if (res !== value) {
             update[attribute.name] = res
-            remove.push(getCollaborativeDocId(doc._id, attribute.name))
+            remove.push(makeCollaborativeDoc(doc._id, attribute.name))
           }
         }
       } catch {}

diff --git a/models/activity/src/migration.ts b/models/activity/src/migration.ts
@@ -46,9 +46,7 @@ async function migrateMarkup (client: MigrationClient): Promise<void> {
     DOMAIN_ACTIVITY,
     {
       _class: activity.class.DocUpdateMessage,
-      'attributeUpdates.attrClass': {
-        $in: [core.class.TypeMarkup, core.class.TypeCollaborativeMarkup]
-      }
+      'attributeUpdates.attrClass': core.class.TypeMarkup
     },
     {
       projection: {

diff --git a/models/contact/src/index.ts b/models/contact/src/index.ts
@@ -39,8 +39,8 @@ import {
   IndexKind,
   type Blob,
   type Class,
+  type CollaborativeDoc,
   type Domain,
-  type Markup,
   type Ref,
   type Timestamp
 } from '@hcengineering/core'
@@ -54,7 +54,7 @@ import {
   ReadOnly,
   TypeBlob,
   TypeBoolean,
-  TypeCollaborativeMarkup,
+  TypeCollaborativeDoc,
   TypeDate,
   TypeRecord,
   TypeRef,
@@ -173,9 +173,9 @@ export class TMember extends TAttachedDoc implements Member {
 @Model(contact.class.Organization, contact.class.Contact)
 @UX(contact.string.Organization, contact.icon.Company, 'ORG', 'name', undefined, contact.string.Organizations)
 export class TOrganization extends TContact implements Organization {
-  @Prop(TypeCollaborativeMarkup(), core.string.Description)
+  @Prop(TypeCollaborativeDoc(), core.string.Description)
   @Index(IndexKind.FullText)
-    description?: Markup
+    description!: CollaborativeDoc
 
   @Prop(Collection(contact.class.Member), contact.string.Members)
     members!: number

diff --git a/models/controlled-documents/src/migration.ts b/models/controlled-documents/src/migration.ts
@@ -8,7 +8,7 @@ import {
   TxOperations,
   generateId,
   DOMAIN_TX,
-  getCollaborativeDoc,
+  makeCollaborativeDoc,
   MeasureMetricsContext,
   type Class,
   type Doc,
@@ -143,7 +143,7 @@ async function createProductChangeControlTemplate (tx: TxOperations): Promise<vo
         minor: 1,
         state: DocumentState.Effective,
         commentSequence: 0,
-        content: getCollaborativeDoc(generateId())
+        content: makeCollaborativeDoc(generateId())
       },
       ccCategory
     )

diff --git a/models/core/package.json b/models/core/package.json
@@ -31,6 +31,8 @@
     "@hcengineering/core": "^0.6.32",
     "@hcengineering/model": "^0.6.11",
     "@hcengineering/platform": "^0.6.11",
-    "@hcengineering/storage": "^0.6.0"
+    "@hcengineering/storage": "^0.6.0",
+    "@hcengineering/collaboration": "^0.6.0",
+    "@hcengineering/text": "^0.6.5"
   }
 }
diff --git a/models/core/src/core.ts b/models/core/src/core.ts
@@ -233,10 +233,6 @@ export class TTypeFileSize extends TType {}
 @Model(core.class.TypeMarkup, core.class.Type)
 export class TTypeMarkup extends TType {}
 
-@UX(core.string.Collaborative)
-@Model(core.class.TypeCollaborativeMarkup, core.class.Type)
-export class TTypeCollaborativeMarkup extends TType {}
-
 @UX(core.string.Ref)
 @Model(core.class.RefTo, core.class.Type)
 export class TRefTo extends TType implements RefTo<Doc> {

diff --git a/models/core/src/index.ts b/models/core/src/index.ts
@@ -61,7 +61,6 @@ import {
   TTypeBoolean,
   TTypeCollaborativeDoc,
   TTypeCollaborativeDocVersion,
-  TTypeCollaborativeMarkup,
   TTypeDate,
   TTypeFileSize,
   TTypeHyperlink,
@@ -141,7 +140,6 @@ export function createModel (builder: Builder): void {
     TTypeMarkup,
     TTypeCollaborativeDoc,
     TTypeCollaborativeDocVersion,
-    TTypeCollaborativeMarkup,
     TArrOf,
     TRefTo,
     TTypeDate,