[go: nahoru, domu]

Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UBERF-7090: Add Office plugins #5725

Merged
merged 3 commits into from
Jun 4, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
uberf-7090: add love
Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com>

Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com>
  • Loading branch information
lexiv0re committed Jun 4, 2024
commit c02c708c068bbec843aa2a71533095f00d0202d8
336 changes: 333 additions & 3 deletions common/config/rush/pnpm-lock.yaml

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions dev/prod/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,9 @@
"@hcengineering/guest-assets": "^0.6.0",
"@hcengineering/guest-resources": "^0.6.0",
"@hcengineering/analytics": "^0.6.0",
"@hcengineering/love": "^0.6.0",
"@hcengineering/love-assets": "^0.6.0",
"@hcengineering/love-resources": "^0.6.0",
"@hcengineering/sign": "^0.6.0",
"@hcengineering/print": "^0.6.0",
"@hcengineering/print-assets": "^0.6.0",
Expand Down
13 changes: 12 additions & 1 deletion dev/prod/src/platform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ import view, { viewId } from '@hcengineering/view'
import workbench, { workbenchId } from '@hcengineering/workbench'

import { bitrixId } from '@hcengineering/bitrix'
import love, { loveId } from '@hcengineering/love'
import print, { printId } from '@hcengineering/print'
import sign from '@hcengineering/sign'
import { productsId } from '@hcengineering/products'
Expand Down Expand Up @@ -84,6 +85,7 @@ import '@hcengineering/time-assets'
import '@hcengineering/tracker-assets'
import '@hcengineering/view-assets'
import '@hcengineering/workbench-assets'
import '@hcengineering/love-assets'
import '@hcengineering/print-assets'
import '@hcengineering/questions-assets'
import '@hcengineering/training-assets'
Expand Down Expand Up @@ -114,6 +116,10 @@ interface Config {
PUSH_PUBLIC_KEY: string
BRANDING_URL?: string
PREVIEW_CONFIG: string
LOVE_ENDPOINT?: string
LIVEKIT_WS?: string
SIGN_URL?: string
PRINT_URL?: string
}

export interface Branding {
Expand Down Expand Up @@ -177,6 +183,7 @@ function configureI18n(): void {
addStringsLoader(productsId, async (lang: string) => await import(`@hcengineering/products-assets/lang/${lang}.json`))
addStringsLoader(questionsId, async (lang: string) => await import(`@hcengineering/questions-assets/lang/${lang}.json`))
addStringsLoader(trainingId, async (lang: string) => await import(`@hcengineering/training-assets/lang/${lang}.json`))
addStringsLoader(loveId, async (lang: string) => await import(`@hcengineering/love-assets/lang/${lang}.json`))
addStringsLoader(printId, async (lang: string) => await import(`@hcengineering/print-assets/lang/${lang}.json`))
}

Expand Down Expand Up @@ -249,7 +256,10 @@ export async function configurePlatform() {
setMetadata(login.metadata.OverrideEndpoint, process.env.LOGIN_ENDPOINT)

setMetadata(rekoni.metadata.RekoniUrl, config.REKONI_URL)

setMetadata(love.metadata.ServiceEnpdoint, config.LOVE_ENDPOINT)
setMetadata(love.metadata.WebSocketURL, config.LIVEKIT_WS)
setMetadata(print.metadata.PrintURL, config.PRINT_URL)
setMetadata(sign.metadata.SignURL, config.SIGN_URL)
setMetadata(textEditor.metadata.CollaboratorUrl, config.COLLABORATOR_URL ?? 'ws://locahost:3078')

setMetadata(uiPlugin.metadata.DefaultApplication, login.component.LoginApp)
Expand Down Expand Up @@ -307,6 +317,7 @@ export async function configurePlatform() {
addLocation(trainingId, () => import(/* webpackChunkName: "training" */ '@hcengineering/training-resources'))
addLocation(productsId, () => import(/* webpackChunkName: "products" */ '@hcengineering/products-resources'))
addLocation(documentsId, () => import(/* webpackChunkName: "documents" */ '@hcengineering/controlled-documents-resources'))
addLocation(loveId, () => import(/* webpackChunkName: "love" */ '@hcengineering/love-resources'))
addLocation(printId, () => import(/* webpackChunkName: "print" */ '@hcengineering/print-resources'))

setMetadata(client.metadata.FilterModel, true)
Expand Down
2 changes: 2 additions & 0 deletions models/all/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@
"@hcengineering/model-server-time": "^0.6.0",
"@hcengineering/model-drive": "^0.6.0",
"@hcengineering/model-server-drive": "^0.6.0",
"@hcengineering/model-love": "^0.6.0",
"@hcengineering/model-server-love": "^0.6.0",
"@hcengineering/model-print": "^0.6.0",
"@hcengineering/model-questions": "^0.1.0",
"@hcengineering/model-training": "^0.1.0",
Expand Down
15 changes: 15 additions & 0 deletions models/all/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ import workbench, { workbenchId, createModel as workbenchModel } from '@hcengine
import { openAIId, createModel as serverOpenAI } from '@hcengineering/model-server-openai'
import { createModel as serverTranslate, translateId } from '@hcengineering/model-server-translate'

import love, { loveId, createModel as loveModel } from '@hcengineering/model-love'
import { serverLoveId, createModel as serverLoveModel } from '@hcengineering/model-server-love'
import { printId, createModel as printModel } from '@hcengineering/model-print'

import { questionsId, createModel as questionsModel } from '@hcengineering/model-questions'
Expand Down Expand Up @@ -311,6 +313,18 @@ export default function buildModel (enabled: string[] = ['*'], disabled: string[
}
],
[timeModel, timeId],
[
loveModel,
loveId,
{
label: love.string.Office,
description: love.string.LoveDescription,
enabled: true,
beta: true,
icon: love.icon.Love,
classFilter: defaultFilter
}
],
[printModel, printId],
[driveModel, driveId],
[supportModel, supportId],
Expand Down Expand Up @@ -381,6 +395,7 @@ export default function buildModel (enabled: string[] = ['*'], disabled: string[
[serverTranslate, translateId],
[serverOpenAI, openAIId],
[serverDocumentModel, serverDocumentId],
[serverLoveModel, serverLoveId],
[serverTimeModel, serverTimeId],
[serverGuestModel, serverGuestId],
[serverDriveModel, serverDriveId],
Expand Down
2 changes: 2 additions & 0 deletions models/all/src/migration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import { calendarOperation } from '@hcengineering/model-calendar'
import { timeOperation } from '@hcengineering/model-time'
import { activityOperation } from '@hcengineering/model-activity'
import { activityServerOperation } from '@hcengineering/model-server-activity'
import { loveId, loveOperation } from '@hcengineering/model-love'
import { documentOperation } from '@hcengineering/model-document'
import { textEditorOperation } from '@hcengineering/model-text-editor'
import { questionsOperation } from '@hcengineering/model-questions'
Expand Down Expand Up @@ -76,6 +77,7 @@ export const migrateOperations: [string, MigrateOperation][] = [
['inventiry', inventoryOperation],
['time', timeOperation],
['activityServer', activityServerOperation],
[loveId, loveOperation],
['document', documentOperation],
['textEditor', textEditorOperation],
// We should call it after activityServer and chunter
Expand Down
7 changes: 7 additions & 0 deletions models/love/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module.exports = {
extends: ['./node_modules/@hcengineering/platform-rig/profiles/model/eslint.config.json'],
parserOptions: {
tsconfigRootDir: __dirname,
project: './tsconfig.json'
}
}
4 changes: 4 additions & 0 deletions models/love/.npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
*
!/lib/**
!CHANGELOG.md
/lib/**/__tests__/
5 changes: 5 additions & 0 deletions models/love/config/rig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
"rigPackageName": "@hcengineering/platform-rig",
"rigProfile": "model"
}
51 changes: 51 additions & 0 deletions models/love/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"name": "@hcengineering/model-love",
"version": "0.6.0",
"main": "lib/index.js",
"svelte": "src/index.ts",
"types": "types/index.d.ts",
"author": "Uberflow Contributors",
"template": "@hcengineering/model-package",
"license": "EPL-2.0",
"scripts": {
"build": "compile",
"build:watch": "compile",
"format": "format src",
"_phase:build": "compile transpile src",
"_phase:format": "format src",
"_phase:validate": "compile validate"
},
"devDependencies": {
"@hcengineering/platform-rig": "^0.6.0",
"@typescript-eslint/eslint-plugin": "^6.11.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-n": "^15.4.0",
"eslint": "^8.54.0",
"@typescript-eslint/parser": "^6.11.0",
"eslint-config-standard-with-typescript": "^40.0.0",
"prettier": "^3.1.0",
"typescript": "^5.3.3"
},
"dependencies": {
"@hcengineering/platform": "^0.6.9",
"@hcengineering/model-presentation": "^0.6.0",
"@hcengineering/presentation": "^0.6.2",
"@hcengineering/contact": "^0.6.20",
"@hcengineering/core": "^0.6.28",
"@hcengineering/model-core": "^0.6.0",
"@hcengineering/ui": "^0.6.11",
"@hcengineering/model": "^0.6.7",
"@hcengineering/setting": "^0.6.11",
"@hcengineering/workbench": "^0.6.9",
"@hcengineering/activity": "^0.6.0",
"@hcengineering/model-preference": "^0.6.0",
"@hcengineering/model-view": "^0.6.0",
"@hcengineering/drive": "^0.6.0",
"@hcengineering/view": "^0.6.9",
"@hcengineering/love": "^0.6.0",
"@hcengineering/love-resources": "^0.6.0",
"@hcengineering/notification": "^0.6.16",
"@hcengineering/model-notification": "^0.6.0"
}
}
Loading