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-9126: drive plugins + init version of screen recorder #8126

Merged
merged 11 commits into from
Mar 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:
restore-keys: ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.sha }}

- name: Checking svelte sources...
run: node common/scripts/install-run-rush.js svelte-check
run: node common/scripts/install-run-rush.js svelte-check -v
formatting:
needs: build
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ temp/
npm-debug.log*
yarn-debug.log*
yarn-error.log*
*./rush-logs
*tests/sanity/screenshots

# Runtime data
Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ To verify the installation, perform the following checks in your terminal:

- Ensure that the `docker` commands are available:

```bash
docker --version
docker compose version
```
```bash
docker --version
docker compose version
```

## Fast start

Expand All @@ -94,16 +94,16 @@ You need Microsoft's [rush](https://rushjs.io) to install the application.

1. Install Rush globally using the command:

```bash
npm install -g @microsoft/rush
```
```bash
npm install -g @microsoft/rush
```

2. Navigate to the repository root and run the following commands:

```bash
rush install
rush build
```
```bash
rush install
rush build
```

Alternatively, you can just execute:

Expand Down
572 changes: 334 additions & 238 deletions common/config/rush/pnpm-lock.yaml

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,9 @@
"@hcengineering/guest-resources": "^0.6.0",
"@hcengineering/presence": "^0.6.0",
"@hcengineering/presence-resources": "^0.6.0",
"@hcengineering/recorder": "^0.6.0",
"@hcengineering/recorder-assets": "^0.6.0",
"@hcengineering/recorder-resources": "^0.6.0",
"@hcengineering/uploader": "^0.6.0",
"@hcengineering/uploader-assets": "^0.6.0",
"@hcengineering/uploader-resources": "^0.6.0",
Expand Down
4 changes: 4 additions & 0 deletions desktop/src/ui/platform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import { templatesId } from '@hcengineering/templates'
import tracker, { trackerId } from '@hcengineering/tracker'
import uiPlugin, { getCurrentLocation, locationStorageKeyId, navigate, setLocationStorageKey } from '@hcengineering/ui'
import { uploaderId } from '@hcengineering/uploader'
import recorder, { recorderId } from '@hcengineering/recorder'
import { viewId } from '@hcengineering/view'
import workbench, { workbenchId } from '@hcengineering/workbench'
import { diffviewId } from '@hcengineering/diffview'
Expand Down Expand Up @@ -89,6 +90,7 @@ import '@hcengineering/view-assets'
import '@hcengineering/workbench-assets'
import '@hcengineering/guest-assets'
import '@hcengineering/uploader-assets'
import '@hcengineering/recorder-assets'
import '@hcengineering/diffview-assets'
import '@hcengineering/time-assets'
import '@hcengineering/desktop-preferences-assets'
Expand Down Expand Up @@ -143,6 +145,7 @@ function configureI18n (): void {
addStringsLoader(textEditorId, async (lang: string) => await import(`@hcengineering/text-editor-assets/lang/${lang}.json`))
addStringsLoader(uiId, async (lang: string) => await import(`@hcengineering/ui/lang/${lang}.json`))
addStringsLoader(uploaderId, async (lang: string) => await import(`@hcengineering/uploader-assets/lang/${lang}.json`))
addStringsLoader(recorderId, async (lang: string) => await import(`@hcengineering/recorder-assets/lang/${lang}.json`))
addStringsLoader(activityId, async (lang: string) => await import(`@hcengineering/activity-assets/lang/${lang}.json`))
addStringsLoader(
attachmentId,
Expand Down Expand Up @@ -234,6 +237,7 @@ export async function configurePlatform (): Promise<void> {
setMetadata(presentation.metadata.UploadConfig, parseUploadConfig(config.UPLOAD_CONFIG, config.UPLOAD_URL))
setMetadata(presentation.metadata.FrontUrl, config.FRONT_URL)
setMetadata(presentation.metadata.LinkPreviewUrl, config.LINK_PREVIEW_URL ?? '')
setMetadata(recorder.metadata.StreamUrl, config.STREAM_URL ?? '')
setMetadata(presentation.metadata.StatsUrl, config.STATS_URL)

setMetadata(textEditor.metadata.Collaborator, config.COLLABORATOR ?? '')
Expand Down
2 changes: 1 addition & 1 deletion desktop/src/ui/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export interface Config {
UPLOAD_CONFIG: string
UPLOAD_URL: string
VERSION?: string

STREAM_URL?: string
BACKUP_URL?: string
PUBLIC_SCHEDULE_URL?: string
}
Expand Down
13 changes: 13 additions & 0 deletions dev/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
services:
stream:
image: 'hardcoreeng/huly-stream'
extra_hosts:
- 'huly.local:host-gateway'
container_name: stream
environment:
- STREAM_ENDPOINT_URL=s3://huly.local:9000
- STREAM_INSECURE=true
- AWS_ACCESS_KEY_ID=minioadmin
- AWS_SECRET_ACCESS_KEY=minioadmin
ports:
- 1080:1080
restart: unless-stopped
mongodb:
image: 'mongo:7-jammy'
container_name: mongodb
Expand Down
3 changes: 2 additions & 1 deletion dev/prod/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
"PRINT_URL": "http://localhost:4005",
"SIGN_URL": "http://localhost:4006",
"ANALYTICS_COLLECTOR_URL":"http://localhost:4007",
"AI_URL": "http://localhost:4010"
"AI_URL": "http://localhost:4010",
"STREAM_URL": "http://localhost:1080/recording"
}
Loading