From 78cdfc173015e0b9f1a3bf8b05756ac4b751f3c5 Mon Sep 17 00:00:00 2001
From: Artem Savchenko <armisav@gmail.com>
Date: Wed, 28 Jan 2026 14:02:58 +0700
Subject: [PATCH 1/2] Add activity section in controlled doc

Signed-off-by: Artem Savchenko <armisav@gmail.com>
---
 .../components/document/EditDocContent.svelte | 22 ++++++++++++++++++-
 .../src/utils.ts                              | 16 ++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/plugins/controlled-documents-resources/src/components/document/EditDocContent.svelte b/plugins/controlled-documents-resources/src/components/document/EditDocContent.svelte
index 59731ba7584..ec99525af67 100644
--- a/plugins/controlled-documents-resources/src/components/document/EditDocContent.svelte
+++ b/plugins/controlled-documents-resources/src/components/document/EditDocContent.svelte
@@ -28,10 +28,11 @@
     highlightUpdateCommand,
     selectNode
   } from '@hcengineering/text-editor-resources'
-  import { EditBox, Label, Scroller } from '@hcengineering/ui'
+  import { Component, EditBox, Label, Scroller } from '@hcengineering/ui'
   import { getCollaborationUser } from '@hcengineering/view-resources'
   import { merge } from 'effector'
   import { createEventDispatcher, onDestroy, tick } from 'svelte'
+  import activity from '@hcengineering/activity'
   import plugin from '../../plugin'
 
   import {
@@ -41,11 +42,13 @@
     $controlledDocument as controlledDocument,
     $documentCommentHighlightedLocation as documentCommentHighlightedLocation,
     $documentComments as documentComments,
+    $documentState as documentState,
     documentCommentsDisplayRequested,
     documentCommentsLocationNavigateRequested,
     documentCommentsAddCanceled,
     $isEditable as isEditable
   } from '../../stores/editors/document'
+  import { isActivityDocumentState } from '../../utils'
   import DocumentPrintTitlePage from '../print/DocumentPrintTitlePage.svelte'
   import DocumentTitle from './DocumentTitle.svelte'
 
@@ -276,6 +279,19 @@
             return await createEmbedding(file)
           }}
         />
+        {#if isActivityDocumentState($documentState)}
+          <div class="activity-container no-print">
+            <Component
+              is={activity.component.Activity}
+              props={{
+                object: $controlledDocument,
+                showCommenInput: true,
+                boundary,
+                focusIndex: 1000
+              }}
+            />
+          </div>
+        {/if}
         <div class="bottomSpacing no-print" />
       </div>
     </Scroller>
@@ -340,6 +356,10 @@
     padding-bottom: 55vh;
   }
 
+  .activity-container {
+    padding-top: 2rem;
+  }
+
   .watermark-container {
     position: absolute;
     z-index: 100;
diff --git a/plugins/controlled-documents-resources/src/utils.ts b/plugins/controlled-documents-resources/src/utils.ts
index 830ef54e858..f3f30205bd4 100644
--- a/plugins/controlled-documents-resources/src/utils.ts
+++ b/plugins/controlled-documents-resources/src/utils.ts
@@ -536,6 +536,15 @@ export const controlledDocumentStatesOrder = [
   ControlledDocumentState.ToReview
 ]
 
+const activityDocumentStates = [
+  DocumentState.Draft,
+  ControlledDocumentState.InReview,
+  ControlledDocumentState.Reviewed,
+  ControlledDocumentState.InApproval,
+  ControlledDocumentState.Approved,
+  ControlledDocumentState.Rejected
+]
+
 export interface LoginInfo {
   email: string
   password: string
@@ -1233,3 +1242,10 @@ export async function extractValidationWorkflow (
 
   return result
 }
+
+export function isActivityDocumentState (state: DocumentState | ControlledDocumentState | null): boolean {
+  if (state == null) {
+    return false
+  }
+  return activityDocumentStates.includes(state)
+}

From dbbb48f98bbafab168e09699eb144de7c1f296c3 Mon Sep 17 00:00:00 2001
From: Artem Savchenko <armisav@gmail.com>
Date: Wed, 28 Jan 2026 14:05:02 +0700
Subject: [PATCH 2/2] Remove approved state

Signed-off-by: Artem Savchenko <armisav@gmail.com>
---
 plugins/controlled-documents-resources/src/utils.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/controlled-documents-resources/src/utils.ts b/plugins/controlled-documents-resources/src/utils.ts
index f3f30205bd4..c58a52dc1b2 100644
--- a/plugins/controlled-documents-resources/src/utils.ts
+++ b/plugins/controlled-documents-resources/src/utils.ts
@@ -541,7 +541,6 @@ const activityDocumentStates = [
   ControlledDocumentState.InReview,
   ControlledDocumentState.Reviewed,
   ControlledDocumentState.InApproval,
-  ControlledDocumentState.Approved,
   ControlledDocumentState.Rejected
 ]