Skip to content

Point collaboration provider at self-hosted docs-collab-server #409

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.

Sign up for GitHub

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

Open
jhodapp wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Point collaboration provider at self-hosted docs-collab-server #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8061eca
feat: point collaboration provider at self-hosted docs-collab-server
jhodapp Jun 1, 2026
75e77f9
test: mock docsCollabUrl in collab provider tests
jhodapp Jun 3, 2026
6ebe091
fix(docker): wire NEXT_PUBLIC_DOCS_COLLAB_URL build arg into image
jhodapp Jul 17, 2026
bc8d626
Merge origin/main into feat/docs-collab-server
jhodapp Jul 21, 2026
a2baf35
fix(ci): pass NEXT_PUBLIC_DOCS_COLLAB_URL as a Docker build-arg
jhodapp Aug 7, 2026
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
1 change: 1 addition & 0 deletions .github/workflows/build_and_push_nonproduction_images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ jobs:
NEXT_PUBLIC_BACKEND_SERVICE_API_PATH=${{ vars.BACKEND_SERVICE_API_PATH }}
NEXT_PUBLIC_BACKEND_API_VERSION=${{ vars.BACKEND_API_VERSION }}
NEXT_PUBLIC_TIPTAP_APP_ID=${{ vars.TIPTAP_APP_ID }}
NEXT_PUBLIC_DOCS_COLLAB_URL=${{ vars.DOCS_COLLAB_URL }}
GIT_COMMIT_SHA=${{ github.sha }}
FRONTEND_SERVICE_PORT=${{ vars.FRONTEND_SERVICE_PORT }}
FRONTEND_SERVICE_INTERFACE=${{ vars.FRONTEND_SERVICE_INTERFACE }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build_and_push_production_images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ jobs:
NEXT_PUBLIC_BACKEND_SERVICE_API_PATH=${{ vars.BACKEND_SERVICE_API_PATH }}
NEXT_PUBLIC_BACKEND_API_VERSION=${{ vars.BACKEND_API_VERSION }}
NEXT_PUBLIC_TIPTAP_APP_ID=${{ vars.TIPTAP_APP_ID }}
NEXT_PUBLIC_DOCS_COLLAB_URL=${{ vars.DOCS_COLLAB_URL }}
FRONTEND_SERVICE_PORT=${{ vars.FRONTEND_SERVICE_PORT }}
FRONTEND_SERVICE_INTERFACE=${{ vars.FRONTEND_SERVICE_INTERFACE }}
tags: ${{ steps.tags.outputs.frontend_tags }} # Use "stable" tag from previous step
Expand Down
5 changes: 5 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ ARG NEXT_PUBLIC_BACKEND_SERVICE_PORT
ARG NEXT_PUBLIC_BACKEND_SERVICE_API_PATH
ARG NEXT_PUBLIC_BACKEND_API_VERSION
ARG NEXT_PUBLIC_TIPTAP_APP_ID
ARG NEXT_PUBLIC_DOCS_COLLAB_URL
ARG NEXT_PUBLIC_BASE_PATH
ARG GIT_COMMIT_SHA
ARG FRONTEND_SERVICE_INTERFACE
Expand Down Expand Up @@ -50,6 +51,7 @@ ARG NEXT_PUBLIC_BACKEND_SERVICE_PORT
ARG NEXT_PUBLIC_BACKEND_SERVICE_API_PATH
ARG NEXT_PUBLIC_BACKEND_API_VERSION
ARG NEXT_PUBLIC_TIPTAP_APP_ID
ARG NEXT_PUBLIC_DOCS_COLLAB_URL
ARG NEXT_PUBLIC_BASE_PATH
ARG GIT_COMMIT_SHA

Expand All @@ -60,6 +62,7 @@ ENV NEXT_PUBLIC_BACKEND_SERVICE_PORT=$NEXT_PUBLIC_BACKEND_SERVICE_PORT
ENV NEXT_PUBLIC_BACKEND_SERVICE_API_PATH=$NEXT_PUBLIC_BACKEND_SERVICE_API_PATH
ENV NEXT_PUBLIC_BACKEND_API_VERSION=$NEXT_PUBLIC_BACKEND_API_VERSION
ENV NEXT_PUBLIC_TIPTAP_APP_ID=$NEXT_PUBLIC_TIPTAP_APP_ID
ENV NEXT_PUBLIC_DOCS_COLLAB_URL=$NEXT_PUBLIC_DOCS_COLLAB_URL
ENV NEXT_PUBLIC_BASE_PATH=$NEXT_PUBLIC_BASE_PATH
ENV GIT_COMMIT_SHA=$GIT_COMMIT_SHA

Expand Down Expand Up @@ -93,6 +96,7 @@ ARG NEXT_PUBLIC_BACKEND_SERVICE_PORT
ARG NEXT_PUBLIC_BACKEND_SERVICE_API_PATH
ARG NEXT_PUBLIC_BACKEND_API_VERSION
ARG NEXT_PUBLIC_TIPTAP_APP_ID
ARG NEXT_PUBLIC_DOCS_COLLAB_URL
ARG NEXT_PUBLIC_BASE_PATH
ARG GIT_COMMIT_SHA
ARG FRONTEND_SERVICE_INTERFACE
Expand All @@ -104,6 +108,7 @@ ENV NEXT_PUBLIC_BACKEND_SERVICE_PORT=$NEXT_PUBLIC_BACKEND_SERVICE_PORT
ENV NEXT_PUBLIC_BACKEND_SERVICE_API_PATH=$NEXT_PUBLIC_BACKEND_SERVICE_API_PATH
ENV NEXT_PUBLIC_BACKEND_API_VERSION=$NEXT_PUBLIC_BACKEND_API_VERSION
ENV NEXT_PUBLIC_TIPTAP_APP_ID=$NEXT_PUBLIC_TIPTAP_APP_ID
ENV NEXT_PUBLIC_DOCS_COLLAB_URL=$NEXT_PUBLIC_DOCS_COLLAB_URL
ENV NEXT_PUBLIC_BASE_PATH=$NEXT_PUBLIC_BASE_PATH
ENV GIT_COMMIT_SHA=$GIT_COMMIT_SHA

Expand Down
2 changes: 1 addition & 1 deletion __tests__/components/ui/coaching-sessions/coaching-notes/connection-status.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ vi.mock('@/lib/hooks/logout-cleanup-registry', () => {
vi.mock('@/site.config', () => ({
siteConfig: {
env: {
tiptapAppId: 'test-app-id'
docsCollabUrl: 'http://test-collab'
}
}
}))
Expand Down
2 changes: 1 addition & 1 deletion __tests__/components/ui/coaching-sessions/editor-cache-context.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ vi.mock('@/lib/hooks/logout-cleanup-registry', () => {
vi.mock('@/site.config', () => ({
siteConfig: {
env: {
tiptapAppId: 'test-app-id'
docsCollabUrl: 'http://test-collab'
}
}
}))
Expand Down
4 changes: 2 additions & 2 deletions src/components/ui/coaching-sessions/editor-cache-context.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ export const EditorCacheProvider: FC<EditorCacheProviderProps> = ({

// Provider initialization: sets up TipTap collaboration with awareness
const initializeProvider = useCallback(async () => {
if (!jwt || !siteConfig.env.tiptapAppId || !userSession) {
if (!jwt || !siteConfig.env.docsCollabUrl || !userSession) {
return;
}

Expand All @@ -297,7 +297,7 @@ export const EditorCacheProvider: FC<EditorCacheProviderProps> = ({
try {
const provider = new TiptapCollabProvider({
name: jwt.sub,
appId: siteConfig.env.tiptapAppId,
baseUrl: siteConfig.env.docsCollabUrl,
token: jwt.token,
document: doc,
user: userSession.display_name,
Expand Down
1 change: 1 addition & 0 deletions src/site.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export const siteConfig = {
frontendServicePort: process.env.FRONTEND_SERVICE_PORT,
frontendServiceInterface: process.env.FRONTEND_SERVICE_INTERFACE,
tiptapAppId: process.env.NEXT_PUBLIC_TIPTAP_APP_ID,
docsCollabUrl: process.env.NEXT_PUBLIC_DOCS_COLLAB_URL,
},
};

Expand Down
Loading