Separate tracker deployment (#1245)

Signed-off-by: Andrey Sobolev <[email protected]>

.github/workflows/main.yml

@@ -69,6 +69,7 @@ jobs:
             packages
             plugins
             pods
+            products
             server
             server-plugins
             templates
@@ -99,6 +100,7 @@ jobs:
             packages
             plugins
             pods
+            products
             server
             server-plugins
             templates
@@ -132,6 +134,7 @@ jobs:
             packages
             plugins
             pods
+            products
             server
             server-plugins
             templates
@@ -165,6 +168,7 @@ jobs:
             packages
             plugins
             pods
+            products
             server
             server-plugins
             templates
@@ -210,6 +214,7 @@ jobs:
             packages
             plugins
             pods
+            products
             server
             server-plugins
             templates
@@ -222,9 +227,9 @@ jobs:
       - name: Installing...
         run: node common/scripts/install-run-rush.js install
       - name: Bundle
-        run: node common/scripts/install-run-rush.js bundle
+        run: node common/scripts/install-run-rush.js bundle --verbose
       - name: Docker build
-        run: node common/scripts/install-run-rush.js docker:build
+        run: node common/scripts/install-run-rush.js docker:build --verbose
       - name: Prepare server
         run: |
           cd ./tests
@@ -266,6 +271,7 @@ jobs:
             packages
             plugins
             pods
+            products
             server
             server-plugins
             templates

.gitignore

@@ -70,4 +70,5 @@ common/autoinstallers/*/.npmrc
 **/.rush/temp/
 bundle.js
 dist
-tsconfig.tsbuildinfo
+tsconfig.tsbuildinfo
+ingest-attachment-*.zip

common/scripts/build_docker.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-roots='./server/server ./server/front ./pods/account'
+roots='./server/server ./server/front ./pods/account ./products/tracker'
 
 for r in $roots
 do

dev/client-resources/src/index.ts

@@ -35,7 +35,6 @@ export default async () => {
           await createDeps(client)
         }
         // Check if we had dev hook for client.
-        // Check if we had dev hook for client.
         const hook = getMetadata(clientPlugin.metadata.ClientHook)
         if (hook !== undefined) {
           const hookProc = await getResource(hook)

dev/docker-compose.yaml

@@ -76,6 +76,26 @@ services:
       - MINIO_ENDPOINT=minio
       - MINIO_ACCESS_KEY=minioadmin
       - MINIO_SECRET_KEY=minioadmin
+  tracker-front:
+    image: hardcoreeng/tracker-front
+    links:
+      - mongodb
+      - minio
+      - elastic
+      - transactor
+    ports:
+      - 8084:8080
+    environment:
+      - SERVER_PORT=8080
+      - SERVER_SECRET=secret
+      - ACCOUNTS_URL=http://localhost:3000
+      - FRONT_URL=http://localhost:8084
+      - UPLOAD_URL=/files
+      - TRANSACTOR_URL=ws://localhost:3333
+      - ELASTIC_URL=http://elastic:9200
+      - MINIO_ENDPOINT=minio
+      - MINIO_ACCESS_KEY=minioadmin
+      - MINIO_SECRET_KEY=minioadmin
   transactor:
     image: hardcoreeng/transactor
     links:

dev/prod/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "prod",
+  "name": "@anticrm/prod",
   "version": "1.0.1",
   "license": "EPL-2.0",
   "scripts": {
@@ -134,6 +134,7 @@
     "@anticrm/presentation": "~0.6.2",
     "@anticrm/tracker": "~0.6.0",
     "@anticrm/tracker-assets": "~0.6.0",
-    "@anticrm/tracker-resources": "~0.6.0"
+    "@anticrm/tracker-resources": "~0.6.0",
+    "@anticrm/text-editor": "~0.6.0"
   }
 }

dev/prod/src/platform.ts

@@ -58,15 +58,18 @@ import '@anticrm/notification-assets'
 import '@anticrm/tags-assets'
 import '@anticrm/calendar-assets'
 import '@anticrm/tracker-assets'
-import presentation from '@anticrm/presentation'
+import presentation, { presentationId } from '@anticrm/presentation'
+import { coreId } from '@anticrm/core'
+import { textEditorId } from '@anticrm/text-editor'
 
 import { setMetadata } from '@anticrm/platform'
+
+
 export async function configurePlatform() {  
   const config = await (await fetch('/config.json')).json()
   console.log('loading configuration', config)
   setMetadata(login.metadata.AccountsUrl, config.ACCOUNTS_URL)
   setMetadata(login.metadata.UploadUrl,  config.UPLOAD_URL)       
-
 
   if( config.MODEL_VERSION != null) {
     console.log('Minimal Model version requirement', config.MODEL_VERSION)
@@ -81,6 +84,10 @@ export async function configurePlatform() {
 
   setMetadata(uiPlugin.metadata.DefaultApplication, workbench.component.WorkbenchApp )
 
+  addLocation(coreId, async () => ({ default: async () => ({}) }))
+  addLocation(presentationId, async () => ({ default: async () => ({}) }))
+  addLocation(textEditorId, async () => ({ default: async () => ({}) }))
+
   addLocation(clientId, () => import(/* webpackChunkName: "client" */ '@anticrm/client-resources'))
   addLocation(loginId, () => import(/* webpackChunkName: "login" */ '@anticrm/login-resources'))
   addLocation(workbenchId, () => import(/* webpackChunkName: "workbench" */ '@anticrm/workbench-resources'))
@@ -103,4 +110,6 @@ export async function configurePlatform() {
   addLocation(calendarId, () => import(/* webpackChunkName: "calendar" */ '@anticrm/calendar-resources'))
 
   addLocation(trackerId, () => import(/* webpackChunkName: "tracker" */ '@anticrm/tracker-resources'))
+
+  setMetadata(workbench.metadata.PlatformTitle, 'Platform')
 }

models/all/src/creation.ts

@@ -18,10 +18,12 @@ import { createDeps as createTaskDeps } from '@anticrm/model-task'
 import { createDeps as createLeadDeps } from '@anticrm/model-lead'
 import { createDeps as createRecruitDeps } from '@anticrm/model-recruit'
 import { createDeps as createDemoDeps } from '@anticrm/model-demo'
+import { createDeps as createTrackerDeps } from '@anticrm/model-tracker'
 
 export async function createDeps (client: Client): Promise<void> {
   await createTaskDeps(client)
   await createLeadDeps(client)
   await createRecruitDeps(client)
   await createDemoDeps(client)
+  await createTrackerDeps(client)
 }

models/all/src/index.ts

@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 
-import core, { Data, Version } from '@anticrm/core'
+import core, { coreId, Data, PluginConfiguration, Ref, Tx, Version } from '@anticrm/core'
 import jsonVersion from './version.json'
 
 import { Builder } from '@anticrm/model'
@@ -58,47 +58,62 @@ export const version: Data<Version> = jsonVersion as Data<Version>
 
 const builder = new Builder()
 
-const builders = [
-  coreModel,
-  activityModel,
-  attachmentModel,
-  viewModel,
-  workbenchModel,
-  contactModel,
-  chunterModel,
-  taskModel,
-  recruitModel,
-  settingModel,
-  telegramModel,
-  leadModel,
-  gmailModel,
-  inventoryModel,
-  presentationModel,
-  templatesModel,
-  textEditorModel,
-  notificationModel,
-  serverCoreModel,
-  serverAttachmentModel,
-  serverContactModel,
-  serverNotificationModel,
-  serveSettingModel,
-  tagsModel,
-  calendarModel,
-  serverChunterModel,
-  serverInventoryModel,
-  serverLeadModel,
-  serverTagsModel,
-  serverTaskModel,
-  serverRecruitModel,
-  serverCalendarModel,
-  serverGmailModel,
-  serverTelegramModel,
-  trackerModel,
-  createDemo
+const builders: [(b: Builder) => void, string][] = [
+  [coreModel, coreId],
+  [activityModel, 'activity'],
+  [attachmentModel, 'attachment'],
+  [viewModel, 'view'],
+  [workbenchModel, 'workbench'],
+  [contactModel, 'contact'],
+  [chunterModel, 'chunter'],
+  [taskModel, 'task'],
+  [recruitModel, 'recruit'],
+  [settingModel, 'setting'],
+  [telegramModel, 'telegram'],
+  [leadModel, 'lead'],
+  [gmailModel, 'gmail'],
+  [inventoryModel, 'inventory'],
+  [presentationModel, 'presentation'],
+  [templatesModel, 'templates'],
+  [textEditorModel, 'text-editor'],
+  [notificationModel, 'notification'],
+
+  [serverCoreModel, 'server-core'],
+  [serverAttachmentModel, 'server-attachment'],
+  [serverContactModel, 'server-contact'],
+  [serverNotificationModel, 'server-notification'],
+  [serveSettingModel, 'server-setting'],
+  [tagsModel, 'tags'],
+  [calendarModel, 'calendar'],
+  [serverChunterModel, 'server-chunter'],
+  [serverInventoryModel, 'server-inventory'],
+  [serverLeadModel, 'server-lead'],
+  [serverTagsModel, 'server-tags'],
+  [serverTaskModel, 'server-task'],
+  [serverRecruitModel, 'server-recruit'],
+  [serverCalendarModel, 'server-calendar'],
+  [serverGmailModel, 'server-gmail'],
+  [serverTelegramModel, 'server-telegram'],
+  [trackerModel, 'tracker'],
+  [createDemo, 'demo']
 ]
 
-for (const b of builders) {
+for (const [b, id] of builders) {
+  const txes: Tx[] = []
+  builder.onTx = (tx) => {
+    txes.push(tx)
+  }
   b(builder)
+  builder.createDoc(
+    core.class.PluginConfiguration,
+    core.space.Model,
+    {
+      pluginId: id,
+      transactions: txes.map((it) => it._id)
+    },
+    ('plugin-configuration-' + id) as Ref<PluginConfiguration>
+  )
+  builder.onTx = undefined
 }
 
 builder.createDoc(core.class.Version, core.space.Model, version, core.version.Model)

models/core/src/core.ts

@@ -20,6 +20,7 @@ import {
   ClassifierKind, Collection, Doc,
   Domain, DOMAIN_MODEL, IndexKind, Interface, Mixin,
   Obj,
+  PluginConfiguration,
   Ref, RefTo, Space,
   Timestamp,
   Type, Version
@@ -143,3 +144,9 @@ export class TVersion extends TDoc implements Version {
   minor!: number
   patch!: number
 }
+
+@Model(core.class.PluginConfiguration, core.class.Doc, DOMAIN_MODEL)
+export class TPluginConfiguration extends TDoc implements PluginConfiguration {
+  pluginId!: string;
+  transactions!: Ref<Doc>[]
+}

models/core/src/index.ts

@@ -25,6 +25,7 @@ import {
   TInterface,
   TMixin,
   TObj,
+  TPluginConfiguration,
   TRefTo,
   TType,
   TTypeBoolean,
@@ -81,6 +82,7 @@ export function createModel (builder: Builder): void {
     TArrOf,
     TVersion,
     TTypeNumber,
-    TTypeIntlString
+    TTypeIntlString,
+    TPluginConfiguration
   )
 }

models/tracker/src/creation.ts

@@ -24,7 +24,12 @@ export async function createDeps (client: Client): Promise<void> {
     _id: tracker.team.DefaultTeam
   })
 
-  if (current === undefined) {
+  const currentDeleted = await tx.findOne(core.class.TxRemoveDoc, {
+    objectId: tracker.team.DefaultTeam
+  })
+
+  // Create new if not deleted by customers.
+  if (current === undefined && currentDeleted === undefined) {
     await tx.createDoc<Team>(
       tracker.class.Team,
       core.space.Space,

packages/core/src/classes.ts

@@ -146,6 +146,15 @@ export interface Class<T extends Obj> extends Classifier {
   sortingKey?: string
 }
 
+/**
+ * @public
+ * Define a set of plugin to model document bindings.
+ */
+export interface PluginConfiguration extends Doc {
+  pluginId: string
+  transactions: Ref<Doc>[]
+}
+
 /**
  * @public
  */