From 59ea15c0a20a5e46f422fbb96a9784bbb921e38a Mon Sep 17 00:00:00 2001
From: Artem Savchenko <armisav@gmail.com>
Date: Wed, 25 Mar 2026 14:17:28 +0700
Subject: [PATCH 1/3] Fix github UI issues

Signed-off-by: Artem Savchenko <armisav@gmail.com>
---
 services/github/github-resources/package.json  |  4 +++-
 .../src/components/PullRequestDiff.svelte      | 18 +++++++++---------
 .../components/RepositoryPresenterRef.svelte   |  2 +-
 .../RepositoryPresenterRefEditor.svelte        |  2 +-
 .../GithubReviewThreadPresenter.svelte         | 12 ++++++------
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/services/github/github-resources/package.json b/services/github/github-resources/package.json
index ee87cda0347..2400d26a6e2 100644
--- a/services/github/github-resources/package.json
+++ b/services/github/github-resources/package.json
@@ -10,7 +10,9 @@
     "build:watch": "compile ui",
     "_phase:build": "compile ui",
     "_phase:format": "format src",
-    "_phase:validate": "compile validate"
+    "_phase:validate": "compile validate",
+    "svelte-check": "do-svelte-check",
+    "_phase:svelte-check": "do-svelte-check"
   },
   "devDependencies": {
     "@hcengineering/platform-rig": "workspace:^0.7.19",
diff --git a/services/github/github-resources/src/components/PullRequestDiff.svelte b/services/github/github-resources/src/components/PullRequestDiff.svelte
index e6c6cd2ffd5..dd58d2c5686 100644
--- a/services/github/github-resources/src/components/PullRequestDiff.svelte
+++ b/services/github/github-resources/src/components/PullRequestDiff.svelte
@@ -3,18 +3,17 @@
 //
 -->
 <script lang="ts">
-  import { PersonAccount } from '@hcengineering/contact'
-  import { getCurrentAccount } from '@hcengineering/core'
   import { createQuery, getClient, getFileUrl } from '@hcengineering/presentation'
   import { Button, Chevron, Component, ExpandCollapse, Label } from '@hcengineering/ui'
   import diffview from '@hcengineering/diffview'
   import { GithubPatch, GithubPullRequest, GithubPullRequestReview } from '@hcengineering/github'
 
   import github from '../plugin'
+  import { getCurrentEmployee } from '@hcengineering/contact'
 
   export let pullRequest: GithubPullRequest
 
-  const me = getCurrentAccount() as PersonAccount
+  const me = getCurrentEmployee()
 
   let isCollapsed = true
 
@@ -37,6 +36,7 @@
   }
 
   $: hasPatch = patch !== undefined && patchText !== ''
+  $: changedFilesCount = patchText === '' ? 0 : (patchText.match(/^diff --git /gm)?.length ?? 0)
 
   let review: GithubPullRequestReview | undefined
 
@@ -46,7 +46,7 @@
     github.class.GithubPullRequestReview,
     {
       attachedTo: pullRequest._id,
-      author: me.person
+      author: me
     },
     (res) => {
       ;[review] = res
@@ -60,7 +60,7 @@
   async function handleFileViewed (fileName: string, sha: string, viewed: boolean): Promise<void> {
     const current = await client.findOne(github.class.GithubPullRequestReview, {
       attachedTo: pullRequest._id,
-      author: me.person
+      author: me
     })
 
     const files = current?.files ?? []
@@ -73,7 +73,7 @@
       files.push({ fileName, sha })
     }
 
-    if (current) {
+    if (current != null) {
       await client.update(current, { files })
     } else {
       await client.addCollection(
@@ -82,7 +82,7 @@
         pullRequest._id,
         github.class.GithubPullRequest,
         'reviewsVisual',
-        { author: me.person, files }
+        { author: me, files }
       )
     }
   }
@@ -106,7 +106,7 @@
             fill={'var(--caption-color)'}
             marginRight={'.375rem'}
           />
-          <Label label={github.string.ChangedFiles} params={{ files: pullRequest.files }} />
+          <Label label={github.string.ChangedFiles} params={{ files: changedFilesCount }} />
         </svelte:fragment>
       </Button>
     </div>
@@ -119,7 +119,7 @@
             props={{ patch: patchText, viewed: viewedFiles }}
             on:change={(evt) => {
               const { fileName, sha, viewed } = evt.detail
-              handleFileViewed(fileName, sha, viewed)
+              void handleFileViewed(fileName, sha, viewed)
             }}
           />
         </div>
diff --git a/services/github/github-resources/src/components/RepositoryPresenterRef.svelte b/services/github/github-resources/src/components/RepositoryPresenterRef.svelte
index eb7ff10dbed..70429d782e6 100644
--- a/services/github/github-resources/src/components/RepositoryPresenterRef.svelte
+++ b/services/github/github-resources/src/components/RepositoryPresenterRef.svelte
@@ -21,7 +21,7 @@
 </script>
 
 <HyperlinkEditor
-  value={repository?.repository?.html_url ?? repository?.htmlURL}
+  value={repository?.htmlURL ?? ''}
   placeholder={getEmbeddedLabel(repository?.name ?? '')}
   title={repository?.name ?? ''}
   readonly
diff --git a/services/github/github-resources/src/components/RepositoryPresenterRefEditor.svelte b/services/github/github-resources/src/components/RepositoryPresenterRefEditor.svelte
index 6367e973eb4..70aae9248cb 100644
--- a/services/github/github-resources/src/components/RepositoryPresenterRefEditor.svelte
+++ b/services/github/github-resources/src/components/RepositoryPresenterRefEditor.svelte
@@ -37,7 +37,7 @@
   export let label: IntlString = github.string.AssignRepository
   export let showIcon: boolean = false
 
-  $: repository = $integrationRepositories.get(value)
+  $: repository = value != null ? $integrationRepositories.get(value) : undefined
 
   let selectedRepository: GithubIntegrationRepository | undefined
 
diff --git a/services/github/github-resources/src/components/presenters/GithubReviewThreadPresenter.svelte b/services/github/github-resources/src/components/presenters/GithubReviewThreadPresenter.svelte
index 309bfaf4965..e6f03a54512 100644
--- a/services/github/github-resources/src/components/presenters/GithubReviewThreadPresenter.svelte
+++ b/services/github/github-resources/src/components/presenters/GithubReviewThreadPresenter.svelte
@@ -3,7 +3,7 @@
 //
 -->
 <script lang="ts">
-  import core, { PersonId, Ref, WithLookup, getCurrentAccount } from '@hcengineering/core'
+  import core, { Ref, WithLookup, getCurrentAccount } from '@hcengineering/core'
   import { GithubPullRequest, GithubReviewComment, GithubReviewThread } from '@hcengineering/github'
 
   import { ActivityMessageHeader, ActivityMessageTemplate } from '@hcengineering/activity-resources'
@@ -82,8 +82,10 @@
     }
   }
 
-  const toRefPersonAccount = (account: PersonId): PersonId => account
-  const toRefPerson = (account?: Ref<Person>): Ref<Person> => account as Ref<Person>
+  function onDiffExpand (nextExpanded: boolean): void {
+    expanded = nextExpanded
+  }
+
 </script>
 
 <div
@@ -122,9 +124,7 @@
               fileName: value.path,
               expandable: value.isResolved,
               expanded,
-              onExpand: (value) => {
-                expanded = value
-              }
+              onExpand: onDiffExpand
             }}
           />
         {/if}

From 97cdbc695d05e9e9ba3e3ac6a9b75bdc03b00e75 Mon Sep 17 00:00:00 2001
From: Artem Savchenko <armisav@gmail.com>
Date: Wed, 25 Mar 2026 14:58:58 +0700
Subject: [PATCH 2/3] Fix formatting

Signed-off-by: Artem Savchenko <armisav@gmail.com>
---
 .../src/components/presenters/GithubReviewThreadPresenter.svelte | 1 -
 1 file changed, 1 deletion(-)

diff --git a/services/github/github-resources/src/components/presenters/GithubReviewThreadPresenter.svelte b/services/github/github-resources/src/components/presenters/GithubReviewThreadPresenter.svelte
index e6f03a54512..8e57c10ec1e 100644
--- a/services/github/github-resources/src/components/presenters/GithubReviewThreadPresenter.svelte
+++ b/services/github/github-resources/src/components/presenters/GithubReviewThreadPresenter.svelte
@@ -85,7 +85,6 @@
   function onDiffExpand (nextExpanded: boolean): void {
     expanded = nextExpanded
   }
-
 </script>
 
 <div

From 496f37530fc07cd701bf9a84d6c9509b7ea9d987 Mon Sep 17 00:00:00 2001
From: Artem Savchenko <armisav@gmail.com>
Date: Wed, 25 Mar 2026 16:04:06 +0700
Subject: [PATCH 3/3] Remove legacy project fields

Signed-off-by: Artem Savchenko <armisav@gmail.com>
---
 .../src/components/ConnectProject.svelte          | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/services/github/github-resources/src/components/ConnectProject.svelte b/services/github/github-resources/src/components/ConnectProject.svelte
index 8cd1ffe888e..c76c633e0ae 100644
--- a/services/github/github-resources/src/components/ConnectProject.svelte
+++ b/services/github/github-resources/src/components/ConnectProject.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { Analytics } from '@hcengineering/analytics'
-  import core, { ClassifierKind, Ref, WithLookup, generateId } from '@hcengineering/core'
-  import { getEmbeddedLabel, getMetadata, translate } from '@hcengineering/platform'
+  import core, { Ref, WithLookup, generateId } from '@hcengineering/core'
+  import { getMetadata, translate } from '@hcengineering/platform'
   import { getClient } from '@hcengineering/presentation'
   import task, { TaskType, updateProjectType, type TaskStatusFactory } from '@hcengineering/task'
   import tracker, { Project, createStatesData } from '@hcengineering/tracker'
@@ -63,13 +63,6 @@
 
     if (!client.getHierarchy().hasMixin(projectInst, github.mixin.GithubProject)) {
       // We need to add GithubProject mixin
-      const mixinId = await getClient().createDoc(core.class.Mixin, core.space.Model, {
-        extends: github.mixin.GithubIssue,
-        kind: ClassifierKind.MIXIN,
-        label: getEmbeddedLabel(projectInst.name),
-        hidden: false,
-        icon: github.icon.Github
-      })
       await getClient().createMixin(
         projectInst._id,
         tracker.class.Project,
@@ -77,9 +70,7 @@
         github.mixin.GithubProject,
         {
           integration: integration._id,
-          repositories: [],
-          mixinClass: mixinId,
-          mappings: []
+          repositories: []
         }
       )
     }