@coopenomics/desktop 2025.11.10-alpha-1 → 2025.11.10-alpha-3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coopenomics/desktop",
-  "version": "2025.11.10-alpha-1",
+  "version": "2025.11.10-alpha-3",
   "description": "A Desktop Project",
   "productName": "Desktop App",
   "author": "Alex Ant <dacom.dark.sun@gmail.com>",
@@ -25,9 +25,9 @@
     "start": "node -r ./alias-resolver.js dist/ssr/index.js"
   },
   "dependencies": {
-    "@coopenomics/controller": "2025.11.10-alpha-1",
-    "@coopenomics/notifications": "2025.11.10-alpha-1",
-    "@coopenomics/sdk": "2025.11.10-alpha-1",
+    "@coopenomics/controller": "2025.11.10-alpha-3",
+    "@coopenomics/notifications": "2025.11.10-alpha-3",
+    "@coopenomics/sdk": "2025.11.10-alpha-3",
     "@dicebear/collection": "^9.0.1",
     "@dicebear/core": "^9.0.1",
     "@editorjs/code": "^2.9.3",
@@ -59,7 +59,7 @@
     "@wharfkit/wallet-plugin-privatekey": "^1.1.0",
     "axios": "^1.2.1",
     "compression": "^1.7.4",
-    "cooptypes": "2025.11.10-alpha-1",
+    "cooptypes": "2025.11.10-alpha-3",
     "dompurify": "^3.1.7",
     "dotenv": "^16.4.5",
     "email-regex": "^5.0.0",
@@ -123,5 +123,5 @@
     "npm": ">= 6.13.4",
     "yarn": ">= 1.21.1"
   },
-  "gitHead": "634766a08edc036ccf4b08438b14251fa3a8ab73"
+  "gitHead": "637950d37f74f959a640d61891ef35d0ace9b858"
 }

package/src/app/layouts/default.vue

@@ -52,12 +52,16 @@ q-layout(view='lHh LpR fff')
       WindowLoader(v-if='desktop?.isWorkspaceChanging')
       router-view(v-else)
 
+      // Глобальный CmdkMenu на уровне всего приложения
+    CmdkMenu
+
 </template>
 
 <script setup lang="ts">
 import { computed } from 'vue';
 import { Header } from 'src/widgets/Header/CommonHeader';
 import { LeftDrawerMenu } from 'src/widgets/Desktop/LeftDrawerMenu';
+import { CmdkMenu } from 'src/widgets/Desktop/CmdkMenu';
 import { ContactsFooter } from 'src/shared/ui/Footer';
 
 import { useDesktopStore } from 'src/entities/Desktop/model';

package/src/entities/CmdkMenu/index.ts

@@ -0,0 +1 @@
+export * from './model';

package/src/entities/CmdkMenu/model/index.ts

@@ -0,0 +1,2 @@
+export * from './store';
+export * from './types';

package/src/entities/CmdkMenu/model/store.ts

@@ -0,0 +1,402 @@
+import { defineStore } from 'pinia';
+import { computed, ref, nextTick } from 'vue';
+import { useRouter } from 'vue-router';
+import { useCurrentUser } from 'src/entities/Session';
+import { useDesktopStore } from 'src/entities/Desktop/model';
+import { useSystemStore } from 'src/entities/System/model';
+import type { PageItem, GroupedItem } from './types';
+
+const namespace = 'cmdk-menu';
+
+export const useCmdkMenuStore = defineStore(namespace, () => {
+  // Composables
+  const router = useRouter();
+  const user = useCurrentUser();
+  const desktop = useDesktopStore();
+  const { info } = useSystemStore();
+
+  // State
+  const showDialog = ref(false);
+  const searchQuery = ref('');
+  const selectedIndex = ref(0);
+  const selectedPageIndex = ref(-1);
+  const searchInput = ref<HTMLInputElement | null>(null);
+  const contentRef = ref<HTMLElement | null>(null);
+
+  // Функция для определения ОС и типа устройства
+  const getOSInfo = () => {
+    const userAgent = navigator.userAgent;
+    const isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(userAgent);
+
+    if (isMobile) {
+      return { os: 'mobile', shortcut: null };
+    }
+
+    // Определение ОС для desktop
+    if (userAgent.includes('Mac')) {
+      return { os: 'mac', shortcut: '⌘ + K' };
+    } else if (userAgent.includes('Windows')) {
+      return { os: 'windows', shortcut: 'Ctrl + K' };
+    } else {
+      // Linux или другие Unix-like системы
+      return { os: 'linux', shortcut: 'Ctrl + K' };
+    }
+  };
+
+  // Вычисляемое свойство для подсказки горячих клавиш
+  const shortcutHint = computed(() => getOSInfo().shortcut);
+
+  // Функция для оценки условий
+  const evaluateCondition = (condition: string, context: Record<string, any>): boolean => {
+    try {
+      const func = new Function(...Object.keys(context), `return ${condition};`);
+      return func(...Object.values(context));
+    } catch (error) {
+      console.error('Error evaluating condition:', error);
+      return false;
+    }
+  };
+
+  // Получение горячих клавиш для страниц
+  const getShortcut = (pageName: string): string | undefined => {
+    const shortcuts: Record<string, string> = {
+      'projects-list': '⌘P',
+      'capital-wallet': '⌘W',
+      'tracker': '⌘T',
+      'voting': '⌘V',
+      'results': '⌘R',
+    };
+    return shortcuts[pageName];
+  };
+
+// Группировка воркспейсов с их страницами
+const groupedItems = computed<GroupedItem[]>(() => {
+  const userRole = user.isChairman
+    ? 'chairman'
+    : user.isMember
+      ? 'member'
+      : 'user';
+
+  return desktop.workspaceMenus
+    .filter(
+      (item) =>
+        item.meta?.roles?.includes(userRole) ||
+        item.meta?.roles === undefined ||
+        item.meta?.roles.length === 0
+    )
+    .map(workspace => ({
+      workspaceName: workspace.workspaceName,
+      title: workspace.title,
+      icon: workspace.icon,
+      isActive: desktop.activeWorkspaceName === workspace.workspaceName,
+      pages: (workspace.mainRoute?.children || [])
+        .filter((page: any) => {
+          // Фильтрация по ролям, условиям и скрытым страницам
+          const rolesMatch =
+            page.meta?.roles?.includes(user.isChairman ? 'chairman' : user.isMember ? 'member' : 'user') ||
+            !page.meta?.roles ||
+            page.meta.roles.length === 0;
+          const conditionMatch = page.meta?.conditions
+            ? evaluateCondition(page.meta.conditions, {
+                isCoop: user.privateAccount.value?.type === 'organization' &&
+                       user.privateAccount.value?.organization_data?.type?.toUpperCase() === 'COOP',
+                userRole: user.isChairman ? 'chairman' : user.isMember ? 'member' : 'user',
+                userAccount: user.privateAccount.value,
+                coopname: info.coopname,
+              })
+            : true;
+          const hiddenMatch = page.meta?.hidden ? !page.meta.hidden : true;
+
+          return rolesMatch && conditionMatch && hiddenMatch;
+        })
+        .map((page: any) => ({
+          name: page.name,
+          meta: page.meta,
+          shortcut: getShortcut(page.name),
+        }))
+    }));
+  });
+
+// Поиск и фильтрация
+const filteredItems = computed(() => {
+  if (!searchQuery.value) {
+    return groupedItems.value;
+  }
+
+    const query = searchQuery.value.toLowerCase();
+
+    return groupedItems.value
+      .map(group => ({
+        ...group,
+        pages: group.pages.filter(page =>
+          page.meta.title.toLowerCase().includes(query) ||
+          page.name.toLowerCase().includes(query) ||
+          group.title.toLowerCase().includes(query) ||
+          group.workspaceName.toLowerCase().includes(query)
+        )
+      }))
+      .filter(group => group.pages.length > 0 || group.title.toLowerCase().includes(query));
+  });
+
+  // Методы
+  const openDialog = async () => {
+    showDialog.value = true;
+    await nextTick();
+    searchInput.value?.focus();
+    searchQuery.value = '';
+    selectedIndex.value = 0;
+    selectedPageIndex.value = -1;
+  };
+
+  const closeDialog = () => {
+    showDialog.value = false;
+    searchQuery.value = '';
+  };
+
+  const handleSearch = () => {
+    selectedIndex.value = 0;
+    selectedPageIndex.value = -1;
+  };
+
+  const selectCurrentItem = () => {
+    if (filteredItems.value.length === 0) return;
+
+    const currentGroup = filteredItems.value[selectedIndex.value];
+    if (!currentGroup) return;
+
+    // Если выбрана страница (selectedPageIndex >= 0), переходим на неё
+    if (selectedPageIndex.value >= 0 && selectedPageIndex.value < currentGroup.pages.length) {
+      const selectedPage = currentGroup.pages[selectedPageIndex.value];
+      selectPage(currentGroup.workspaceName, selectedPage);
+    } else {
+      // Если выбрана группа (selectedPageIndex === -1), переходим на группу
+      selectGroup(selectedIndex.value);
+    }
+  };
+
+  const selectFirstItem = () => {
+    if (filteredItems.value.length > 0) {
+      const firstGroup = filteredItems.value[0];
+      if (firstGroup.pages.length > 0) {
+        selectPage(firstGroup.workspaceName, firstGroup.pages[0]);
+      } else {
+        selectGroup(0);
+      }
+    }
+  };
+
+  const scrollToSelected = () => {
+    if (!contentRef.value) return;
+
+    const selectedElement = contentRef.value.querySelector('.selected');
+    if (!selectedElement) return;
+
+    // Используем requestAnimationFrame для надежного ожидания обновления DOM
+    requestAnimationFrame(() => {
+      const container = contentRef.value;
+      if (!container) return;
+
+      // Простая логика: всегда прокручиваем выбранный элемент в верхнюю часть видимой области
+      selectedElement.scrollIntoView({
+        behavior: 'smooth',
+        block: 'start', // элемент будет по центру видимой области
+        inline: 'nearest'
+      });
+    });
+  };
+
+  const navigateDown = async () => {
+    const totalGroups = filteredItems.value.length;
+    if (totalGroups === 0) return;
+
+    const currentGroup = filteredItems.value[selectedIndex.value];
+    const hasPages = currentGroup.pages.length > 0;
+
+    if (hasPages && selectedPageIndex.value < currentGroup.pages.length - 1) {
+      selectedPageIndex.value++;
+    } else if (selectedIndex.value < totalGroups - 1) {
+      selectedIndex.value++;
+      selectedPageIndex.value = -1;
+    } else {
+      selectedIndex.value = 0;
+      selectedPageIndex.value = -1;
+    }
+
+    // Ждем обновления DOM перед скроллом
+    await nextTick();
+    scrollToSelected();
+  };
+
+  const navigateUp = async () => {
+    const totalGroups = filteredItems.value.length;
+    if (totalGroups === 0) return;
+
+    if (selectedPageIndex.value > 0) {
+      selectedPageIndex.value--;
+    } else if (selectedIndex.value > 0) {
+      selectedIndex.value--;
+      const prevGroup = filteredItems.value[selectedIndex.value];
+      selectedPageIndex.value = prevGroup.pages.length > 0 ? prevGroup.pages.length - 1 : -1;
+    } else {
+      selectedIndex.value = totalGroups - 1;
+      const lastGroup = filteredItems.value[selectedIndex.value];
+      selectedPageIndex.value = lastGroup.pages.length > 0 ? lastGroup.pages.length - 1 : -1;
+    }
+
+    // Ждем обновления DOM перед скроллом
+    await nextTick();
+    scrollToSelected();
+  };
+
+  const selectGroup = (groupIndex: number) => {
+    const group = filteredItems.value[groupIndex];
+    if (!group) return;
+
+    closeDialog();
+
+    desktop.selectWorkspace(group.workspaceName);
+    setTimeout(() => {
+      desktop.goToDefaultPage(router);
+    }, 100);
+  };
+
+  const selectPage = (workspaceName: string, page: PageItem) => {
+    closeDialog();
+
+    // Если воркспейс не активен, переключаемся на него и ждем
+    if (desktop.activeWorkspaceName !== workspaceName) {
+      desktop.selectWorkspace(workspaceName);
+      // Ждем переключения воркспейса, затем переходим на страницу
+      setTimeout(() => {
+        router.push({
+          name: page.name,
+          params: { coopname: info.coopname },
+        });
+        // Сбрасываем состояние загрузки после перехода
+        setTimeout(() => {
+          desktop.setWorkspaceChanging(false);
+        }, 500);
+      }, 150);
+    } else {
+      // Воркспейс уже активен, переходим сразу
+      router.push({
+        name: page.name,
+        params: { coopname: info.coopname },
+      });
+      // Сбрасываем состояние загрузки после перехода
+      setTimeout(() => {
+        desktop.setWorkspaceChanging(false);
+      }, 500);
+    }
+  };
+
+  // Обработчик клавиш для диалога (навигация внутри панели)
+  const handleDialogKeydown = (event: KeyboardEvent) => {
+    // Предотвращаем обработку глобального обработчика для диалога
+    event.stopPropagation();
+
+    switch (event.key) {
+      case 'ArrowDown':
+        event.preventDefault();
+        navigateDown();
+        break;
+      case 'ArrowUp':
+        event.preventDefault();
+        navigateUp();
+        break;
+      case 'Enter':
+        event.preventDefault();
+        selectCurrentItem();
+        break;
+      case 'Escape':
+        event.preventDefault();
+        closeDialog();
+        break;
+    }
+  };
+
+  // Глобальные горячие клавиши
+  const handleGlobalKeydown = (event: KeyboardEvent) => {
+    // Определяем правильную клавишу-модификатор для текущей ОС
+    const isMac = navigator.userAgent.includes('Mac');
+    const modifierPressed = isMac ? event.metaKey : event.ctrlKey;
+
+    // Проверяем комбинацию Ctrl/Cmd + K
+    if (modifierPressed && event.key.toLowerCase() === 'k') {
+      event.preventDefault();
+      event.stopPropagation();
+
+      if (showDialog.value) {
+        closeDialog();
+      } else {
+        openDialog();
+      }
+      return;
+    }
+
+    // Escape для закрытия панели (только когда панель открыта)
+    if (event.key === 'Escape' && showDialog.value) {
+      event.preventDefault();
+      closeDialog();
+    }
+  };
+
+  // Инициализация глобальных обработчиков клавиш
+  const initGlobalKeydown = () => {
+    document.addEventListener('keydown', handleGlobalKeydown);
+  };
+
+  const destroyGlobalKeydown = () => {
+    document.removeEventListener('keydown', handleGlobalKeydown);
+  };
+
+  const setSearchInput = (input: HTMLInputElement | null) => {
+    searchInput.value = input as HTMLInputElement | null;
+  };
+
+  const setContentRef = (ref: HTMLElement | null) => {
+    contentRef.value = ref;
+  };
+
+  return {
+    // State
+    showDialog,
+    searchQuery,
+    selectedIndex,
+    selectedPageIndex,
+    searchInput,
+    contentRef,
+
+    // Computed
+    filteredItems,
+    shortcutHint,
+    activeWorkspaceIcon: computed(() => {
+      const activeWorkspace = desktop.workspaceMenus.find(
+        ws => ws.workspaceName === desktop.activeWorkspaceName
+      );
+      return activeWorkspace?.icon || 'fa-solid fa-desktop';
+    }),
+    activeWorkspaceTitle: computed(() => {
+      const activeWorkspace = desktop.workspaceMenus.find(
+        ws => ws.workspaceName === desktop.activeWorkspaceName
+      );
+      return activeWorkspace?.title || 'Рабочий стол';
+    }),
+
+    // Methods
+    openDialog,
+    closeDialog,
+    handleSearch,
+    handleDialogKeydown,
+    selectFirstItem,
+    selectCurrentItem,
+    navigateDown,
+    navigateUp,
+    selectGroup,
+    selectPage,
+    setSearchInput,
+    setContentRef,
+    initGlobalKeydown,
+    destroyGlobalKeydown,
+  };
+});

package/src/entities/CmdkMenu/model/types.ts

@@ -0,0 +1,21 @@
+export interface PageItem {
+  name: string;
+  meta: any;
+  shortcut?: string;
+}
+
+export interface GroupedItem {
+  workspaceName: string;
+  title: string;
+  icon: string;
+  isActive: boolean;
+  pages: PageItem[];
+}
+
+export interface CmdkMenuState {
+  showDialog: boolean;
+  searchQuery: string;
+  selectedIndex: number;
+  selectedPageIndex: number;
+  searchInput: HTMLInputElement | undefined;
+}

package/src/entities/ConnectionAgreement/index.ts

@@ -0,0 +1 @@
+export * from './model'

package/src/entities/ConnectionAgreement/model/index.ts

@@ -0,0 +1,2 @@
+export { useConnectionAgreementStore } from './store'
+export type { ITariff, IConnectionAgreementState } from './types'

package/src/entities/ConnectionAgreement/model/store.ts

@@ -0,0 +1,82 @@
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+import type { ITariff, IConnectionAgreementState } from './types'
+
+
+const namespace = 'connection-agreement'
+
+export const useConnectionAgreementStore = defineStore(namespace, () => {
+  // State
+  const currentStep = ref<number>(1)
+  const selectedTariff = ref<ITariff | null>(null)
+  const isInitialized = ref<boolean>(false)
+  const document = ref<any>(null)
+  const signedDocument = ref<any>(null)
+
+  // Methods
+  const setCurrentStep = (step: number) => {
+    currentStep.value = step
+  }
+
+  const setSelectedTariff = (tariff: ITariff | null) => {
+    selectedTariff.value = tariff
+  }
+
+  const setInitialized = (initialized: boolean) => {
+    isInitialized.value = initialized
+  }
+
+  const setDocument = (doc: any) => {
+    document.value = doc
+  }
+
+  const setSignedDocument = (doc: any) => {
+    signedDocument.value = doc
+  }
+
+  const reset = () => {
+    currentStep.value = 1
+    selectedTariff.value = null
+    isInitialized.value = false
+    document.value = null
+    signedDocument.value = null
+  }
+
+  const initialize = (state: Partial<IConnectionAgreementState>) => {
+    if (state.currentStep !== undefined) {
+      currentStep.value = state.currentStep
+    }
+    if (state.selectedTariff !== undefined) {
+      selectedTariff.value = state.selectedTariff
+    }
+    if (state.isInitialized !== undefined) {
+      isInitialized.value = state.isInitialized
+    }
+    if (state.document !== undefined) {
+      document.value = state.document
+    }
+    if (state.signedDocument !== undefined) {
+      signedDocument.value = state.signedDocument
+    }
+  }
+
+  return {
+    // State
+    currentStep,
+    selectedTariff,
+    isInitialized,
+    document,
+    signedDocument,
+
+    // Methods
+    setCurrentStep,
+    setSelectedTariff,
+    setInitialized,
+    setDocument,
+    setSignedDocument,
+    reset,
+    initialize
+  }
+}, {
+  persist: true
+})

package/src/entities/ConnectionAgreement/model/types.ts

@@ -0,0 +1,16 @@
+export interface ITariff {
+  id: string
+  name: string
+  description: string
+  price: string
+  features: string[]
+  additionalCosts?: string[]
+}
+
+export interface IConnectionAgreementState {
+  currentStep: number
+  selectedTariff: ITariff | null
+  isInitialized: boolean
+  document?: any
+  signedDocument?: any
+}

package/src/features/Union/AddCooperative/ui/AddCooperativeForm.vue

@@ -1,5 +1,5 @@
 <template lang="pug">
-Form(:handler-submit="addNow" :is-submitting="isSubmitting" :showCancel="false" :button-cancel-txt="'Отменить'" :button-submit-txt="'Отправить'" @cancel="clear").q-gutter-md
+Form(:handler-submit="addNow" :is-submitting="isSubmitting" :showCancel="false" :button-cancel-txt="'Отменить'" :button-submit-txt="'Продолжить'" @cancel="clear").q-gutter-md
   //- q-input(standout="bg-teal text-white" label="Имя аккаунта" v-model="data.coopname" :rules="[val => notEmpty(val)]")
   q-input(standout="bg-teal text-white" hint="domovoy.com или coop.domovoy.com" label="Домен или поддомен для запуска" v-model="data.params.announce" :rules="[val => notEmpty(val), val => isDomain(val)]")
 
@@ -21,7 +21,7 @@ Form(:handler-submit="addNow" :is-submitting="isSubmitting" :showCancel="false"
 
 </template>
 <script lang="ts" setup>
-import { computed, ref } from 'vue';
+import { computed, ref, watch } from 'vue';
 import { useAddCooperative } from '../model';
 import { Form } from 'src/shared/ui/Form';
 import { notEmpty, isDomain } from 'src/shared/lib/utils';
@@ -41,6 +41,10 @@ const props = defineProps({
   document: {
     type: Object as () => IDocument,
     required: true,
+  },
+  cooperative: {
+    type: Object as () => any,
+    default: null,
   }
 })
 
@@ -48,17 +52,31 @@ const document = computed(() => props.document)
 
 const session = useSessionStore()
 
+// Функция для извлечения числового значения из IAsset
+const extractNumericValue = (asset: any): string => {
+  if (!asset) return ''
+  if (typeof asset === 'number') return asset.toString()
+  if (typeof asset === 'string') {
+    // Извлекаем число из строки типа "1000.0000 RUB" и убираем лишние нули
+    const match = asset.match(/^(\d+(?:\.\d+)?)/)
+    if (match) {
+      return parseFloat(match[1]).toString()
+    }
+  }
+  return ''
+}
+
 const data = ref<RegistratorContract.Actions.RegisterCooperative.IRegisterCooperative>({
   coopname: session.username,
   params: {
     is_cooperative: true,
     coop_type: 'conscoop',
-    announce: '',
+    announce: props.cooperative?.announce || '',
     description: '',
-    initial: '',
-    minimum: '',
-    org_initial: '',
-    org_minimum: ''
+    initial: extractNumericValue(props.cooperative?.initial),
+    minimum: extractNumericValue(props.cooperative?.minimum),
+    org_initial: extractNumericValue(props.cooperative?.org_initial),
+    org_minimum: extractNumericValue(props.cooperative?.org_minimum)
   },
   username: session.username,
   document: {
@@ -71,6 +89,17 @@ const data = ref<RegistratorContract.Actions.RegisterCooperative.IRegisterCooper
   }
 })
 
+// Следим за изменениями cooperative и обновляем данные
+watch(() => props.cooperative, (newCooperative) => {
+  if (newCooperative) {
+    data.value.params.announce = newCooperative.announce || ''
+    data.value.params.initial = extractNumericValue(newCooperative.initial)
+    data.value.params.minimum = extractNumericValue(newCooperative.minimum)
+    data.value.params.org_initial = extractNumericValue(newCooperative.org_initial)
+    data.value.params.org_minimum = extractNumericValue(newCooperative.org_minimum)
+  }
+}, { immediate: true })
+
 const clear = () => {
   emit('finish')
 }