From d06266fb938f5d3ca11210e47637aca1574c5273 Mon Sep 17 00:00:00 2001
From: Nikolai Giman <gimanhead@gmail.com>
Date: Sun, 5 Apr 2026 22:39:03 +0200
Subject: [PATCH] fix: ui, locale, tests

---
 .../src/api/__tests__/api-tokens.test.ts      |  4 ++--
 .../src/api/__tests__/collaboration.test.ts   |  2 +-
 .../src/api/__tests__/webhooks.test.ts        |  2 +-
 web/src/components/UserMenu.vue               | 23 ++++++++++---------
 .../features/base/TvMobileBottomNav.vue       |  2 +-
 .../organizations/OrganizationsPanel.vue      |  4 +++-
 web/src/locales/en.ts                         |  2 ++
 web/src/locales/index.ts                      |  2 +-
 web/src/locales/ru.ts                         |  2 ++
 9 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/taskview-packages/taskview-api/src/api/__tests__/api-tokens.test.ts b/taskview-packages/taskview-api/src/api/__tests__/api-tokens.test.ts
index 69be2af..19fd3ac 100644
--- a/taskview-packages/taskview-api/src/api/__tests__/api-tokens.test.ts
+++ b/taskview-packages/taskview-api/src/api/__tests__/api-tokens.test.ts
@@ -748,7 +748,7 @@ describe('API Tokens', () => {
 
             const user2Token = await $tvApiForSecondUser.apiTokens.create({ name: 'User2 token' });
 
-            const result = await $api.apiTokens.delete(user2Token!.item.id);
+            await $api.apiTokens.delete(user2Token!.item.id);
             // should return false or not delete it
             const user2Tokens = await $tvApiForSecondUser.apiTokens.fetch();
             const stillExists = user2Tokens!.find(t => t.id === user2Token!.item.id);
@@ -827,7 +827,7 @@ describe('API Tokens', () => {
                 headers: { Authorization: `Bearer ${created!.token}` },
             }));
 
-            const result = await tokenApi.collaboration.inviteUserToGoal({
+            await tokenApi.collaboration.inviteUserToGoal({
                 goalId,
                 email: `token-invite-${Date.now()}@test.com`,
             }).catch((err) => err.status);
diff --git a/taskview-packages/taskview-api/src/api/__tests__/collaboration.test.ts b/taskview-packages/taskview-api/src/api/__tests__/collaboration.test.ts
index c8b4f8c..a6e78ea 100644
--- a/taskview-packages/taskview-api/src/api/__tests__/collaboration.test.ts
+++ b/taskview-packages/taskview-api/src/api/__tests__/collaboration.test.ts
@@ -318,7 +318,7 @@ describe('Collaboration', () => {
             throw new Error('Failed to add user to goal');
         }
 
-        const addResult2 = await $api.collaboration.inviteUserToGoal({
+        await $api.collaboration.inviteUserToGoal({
             goalId: collaborationGoal?.id!,
             email: email,
         }).catch(console.error);
diff --git a/taskview-packages/taskview-api/src/api/__tests__/webhooks.test.ts b/taskview-packages/taskview-api/src/api/__tests__/webhooks.test.ts
index 87704fe..2168ab0 100644
--- a/taskview-packages/taskview-api/src/api/__tests__/webhooks.test.ts
+++ b/taskview-packages/taskview-api/src/api/__tests__/webhooks.test.ts
@@ -7,7 +7,7 @@ import {
   afterAll,
 } from 'vitest'
 import { initApi } from './init-api'
-import { createServer, type Server, type IncomingMessage, type ServerResponse } from 'http'
+import { createServer, type IncomingMessage, type ServerResponse } from 'http'
 import { networkInterfaces } from 'os'
 
 function getLocalIp(): string {
diff --git a/web/src/components/UserMenu.vue b/web/src/components/UserMenu.vue
index e5549ea..ca9b236 100644
--- a/web/src/components/UserMenu.vue
+++ b/web/src/components/UserMenu.vue
@@ -2,7 +2,7 @@
   <UDropdownMenu
     :items="items"
     :content="{ align: 'center', collisionPadding: 12 }"
-    :ui="{ content: collapsed ? 'w-48' : 'w-(--reka-dropdown-menu-trigger-width)' }"
+    :ui="{ content: collapsed ? 'w-48' : 'w-(--reka-dropdown-menu-trigger-width)', group: 'max-h-screen' }"
   >
     <UButton
       v-bind="{
@@ -129,17 +129,18 @@ const items = computed<DropdownMenuItem[][]>(() => [
   ],
   orgStore.organizations.length > 1 ? [
     {
-      type: 'label' as const,
-      label: t('userMenu.switchOrganization'),
+      label: orgStore.currentOrg?.name || t('userMenu.switchOrganization'),
+      icon: 'i-lucide-building-2',
+      
+      children: orgStore.organizations.map(org => ({
+        label: org.name,
+        icon: org.id === orgStore.currentOrg?.id ? 'i-lucide-check' : undefined,
+        onSelect(e: Event) {
+          e.preventDefault()
+          orgStore.setCurrentOrg(org)
+        },
+      })),
     },
-    ...orgStore.organizations.map(org => ({
-      label: org.name,
-      icon: org.id === orgStore.currentOrg?.id ? 'i-lucide-check' : 'i-lucide-building-2',
-      onSelect(e: Event) {
-        e.preventDefault()
-        orgStore.setCurrentOrg(org)
-      },
-    })),
   ] : [],
   [
     {
diff --git a/web/src/components/features/base/TvMobileBottomNav.vue b/web/src/components/features/base/TvMobileBottomNav.vue
index 358c8d9..dd8a718 100644
--- a/web/src/components/features/base/TvMobileBottomNav.vue
+++ b/web/src/components/features/base/TvMobileBottomNav.vue
@@ -1,5 +1,5 @@
 <template>
-  <nav class="fixed bottom-0 left-0 right-0 z-50 lg:hidden border-t border-default pb-safe">
+  <nav class="fixed bottom-0 left-0 right-0 z-50 lg:hidden border-t border-default pb-safe bg-default">
     <div class="flex items-center justify-between min-h-14">
       <UButton
         v-for="item in navItems"
diff --git a/web/src/components/features/organizations/OrganizationsPanel.vue b/web/src/components/features/organizations/OrganizationsPanel.vue
index 9e6a179..ec12457 100644
--- a/web/src/components/features/organizations/OrganizationsPanel.vue
+++ b/web/src/components/features/organizations/OrganizationsPanel.vue
@@ -3,7 +3,7 @@
     <div class="flex items-center justify-between">
       <h2 class="text-lg font-semibold">{{ t('organizations.title') }}</h2>
       <UButton
-        :label="t('organizations.create')"
+        :label="isMobile ? undefined : t('organizations.create')"
         icon="i-lucide-plus"
         @click="showCreateModal = true"
       />
@@ -46,10 +46,12 @@
 import { ref, onMounted } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useOrganizationStore } from '@/stores/organization.store'
+import { useTaskView } from '@/composables/useTaskView'
 import OrgCreateModal from './parts/OrgCreateModal.vue'
 import OrgDetailModal from './parts/OrgDetailModal.vue'
 
 const { t } = useI18n()
+const { isMobile } = useTaskView()
 const orgStore = useOrganizationStore()
 
 const showCreateModal = ref(false)
diff --git a/web/src/locales/en.ts b/web/src/locales/en.ts
index 38eb6e8..d635878 100644
--- a/web/src/locales/en.ts
+++ b/web/src/locales/en.ts
@@ -465,6 +465,8 @@ export default {
     delete: 'Delete organization',
     deleteConfirm: 'Are you sure you want to delete this organization and all its projects?',
     empty: 'No organizations yet',
+    currentOrg: 'Current organization',
+    active: 'Active',
     settings: 'Settings',
     general: 'General',
     save: 'Save',
diff --git a/web/src/locales/index.ts b/web/src/locales/index.ts
index 8d5ff67..072ca88 100644
--- a/web/src/locales/index.ts
+++ b/web/src/locales/index.ts
@@ -8,4 +8,4 @@ export const messages = {
 
 export type Locale = keyof typeof messages
 export const locales: Locale[] = ['en', 'ru']
-export const defaultLocale: Locale = 'ru'
+export const defaultLocale: Locale = 'en'
diff --git a/web/src/locales/ru.ts b/web/src/locales/ru.ts
index 475ba66..463c186 100644
--- a/web/src/locales/ru.ts
+++ b/web/src/locales/ru.ts
@@ -437,6 +437,8 @@ export default {
     delete: 'Удалить организацию',
     deleteConfirm: 'Вы уверены что хотите удалить эту организацию и все её проекты?',
     empty: 'Нет организаций',
+    currentOrg: 'Текущая организация',
+    active: 'Активна',
     settings: 'Настройки',
     general: 'Основные',
     save: 'Сохранить',