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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coopenomics/desktop",
-  "version": "2025.11.10-alpha-3",
+  "version": "2025.11.12-alpha-1",
   "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-3",
-    "@coopenomics/notifications": "2025.11.10-alpha-3",
-    "@coopenomics/sdk": "2025.11.10-alpha-3",
+    "@coopenomics/controller": "2025.11.12-alpha-1",
+    "@coopenomics/notifications": "2025.11.12-alpha-1",
+    "@coopenomics/sdk": "2025.11.12-alpha-1",
     "@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-3",
+    "cooptypes": "2025.11.12-alpha-1",
     "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": "637950d37f74f959a640d61891ef35d0ace9b858"
+  "gitHead": "b261f505aa7897cdc82ce88ed770fe0f6aee7afc"
 }

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

@@ -0,0 +1,26 @@
+import { client } from 'src/shared/api/client';
+import { Queries } from '@coopenomics/sdk';
+
+/**
+ * Тип текущего инстанса из GraphQL API
+ */
+export type CurrentInstance = Queries.System.GetCurrentInstance.IOutput[typeof Queries.System.GetCurrentInstance.name];
+
+/**
+ * Получить текущий инстанс авторизованного пользователя
+ */
+export async function getCurrentInstance(): Promise<CurrentInstance | null> {
+  try {
+    const { [Queries.System.GetCurrentInstance.name]: instance } =
+      await client.Query(Queries.System.GetCurrentInstance.query);
+
+    return instance;
+  } catch (error) {
+    console.error('Ошибка при получении текущего инстанса:', error);
+    return null;
+  }
+}
+
+export const api = {
+  getCurrentInstance
+};

package/src/entities/ConnectionAgreement/index.ts

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

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

@@ -1,6 +1,10 @@
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
-import type { ITariff, IConnectionAgreementState } from './types'
+import { DigitalDocument } from 'src/shared/lib/document'
+import { useSessionStore } from 'src/entities/Session'
+import { useLoadCooperatives } from 'src/features/Union/LoadCooperatives'
+import { getCurrentInstance, type CurrentInstance } from '../api'
+import type { ITariff, IConnectionAgreementState, ICooperativeFormData } from './types'
 
 
 const namespace = 'connection-agreement'
@@ -12,6 +16,17 @@ export const useConnectionAgreementStore = defineStore(namespace, () => {
   const isInitialized = ref<boolean>(false)
   const document = ref<any>(null)
   const signedDocument = ref<any>(null)
+  const currentInstance = ref<CurrentInstance | null>(null)
+  const currentInstanceLoading = ref<boolean>(false)
+  const currentInstanceError = ref<string | null>(null)
+  const coop = ref<any>(null)
+  const formData = ref<ICooperativeFormData>({
+    announce: '',
+    initial: '',
+    minimum: '',
+    org_initial: '',
+    org_minimum: ''
+  })
 
   // Methods
   const setCurrentStep = (step: number) => {
@@ -34,12 +49,132 @@ export const useConnectionAgreementStore = defineStore(namespace, () => {
     signedDocument.value = doc
   }
 
+  const setCoop = (coopData: any) => {
+    coop.value = coopData
+  }
+
+  const setFormData = (data: ICooperativeFormData) => {
+    formData.value = data
+  }
+
+  // Actions
+  const generateDocument = async () => {
+    console.log('🔄 Начинаем генерацию документа')
+    const session = useSessionStore()
+    const formDataValue = formData.value
+    console.log('📋 Данные формы:', formDataValue)
+
+    try {
+      console.log('📄 Создаем новый DigitalDocument')
+      const newDoc = new DigitalDocument()
+
+    const params: any = {
+      registry_id: 50,
+      coopname: 'voskhod',
+      username: session.username
+    }
+
+      // Передаем данные из формы в документ, если они есть
+      if (formDataValue) {
+        params.announce = formDataValue.announce
+        params.initial = formDataValue.initial
+        params.minimum = formDataValue.minimum
+        params.org_initial = formDataValue.org_initial
+        params.org_minimum = formDataValue.org_minimum
+      }
+
+      console.log('🔧 Генерируем документ с параметрами:', params)
+
+      await newDoc.generate(params)
+
+      console.log('✅ Документ успешно сгенерирован')
+      document.value = newDoc
+      return newDoc
+    } catch (error) {
+      console.error('❌ Ошибка при генерации документа:', error)
+      throw error
+    }
+  }
+
+  const signDocument = async () => {
+    const session = useSessionStore()
+    if (!document.value) {
+      throw new Error('Документ не найден')
+    }
+
+    await document.value.sign(session.username)
+    signedDocument.value = document.value.signedDocument
+    return signedDocument.value
+  }
+
+  const clearSignedDocument = async () => {
+    // Очищаем подписанный документ
+    signedDocument.value = null
+
+    // Регенерируем документ заново если есть данные формы
+    if (formData.value) {
+      await generateDocument()
+    }
+  }
+
+  const reloadCooperative = async () => {
+    const { loadOneCooperative } = useLoadCooperatives()
+    const session = useSessionStore()
+
+    try {
+      const coopData = await loadOneCooperative(session.username)
+      coop.value = coopData
+      return coopData
+    } catch (error) {
+      console.error('Ошибка при перезагрузке кооператива:', error)
+      throw error
+    }
+  }
+
+  const loadCurrentInstance = async () => {
+    try {
+      currentInstanceLoading.value = true
+      currentInstanceError.value = null
+      currentInstance.value = await getCurrentInstance()
+      console.log('Текущий инстанс загружен:', currentInstance.value)
+    } catch (error: any) {
+      currentInstanceError.value = error.message || 'Ошибка загрузки инстанса'
+      console.error('Ошибка при загрузке текущего инстанса:', error)
+    } finally {
+      currentInstanceLoading.value = false
+    }
+  }
+
+  const startInstanceAutoRefresh = (intervalMs = 30000) => { // 30 секунд по умолчанию
+    loadCurrentInstance() // Первая загрузка
+
+    const interval = setInterval(() => {
+      loadCurrentInstance()
+    }, intervalMs)
+
+    // Функция для остановки автообновления
+    const stop = () => clearInterval(interval)
+
+    return stop
+  }
+
   const reset = () => {
     currentStep.value = 1
     selectedTariff.value = null
     isInitialized.value = false
     document.value = null
     signedDocument.value = null
+    currentInstance.value = null
+    currentInstanceLoading.value = false
+    currentInstanceError.value = null
+    coop.value = null
+    formData.value = {
+      announce: '',
+      initial: '',
+      minimum: '',
+      org_initial: '',
+      org_minimum: ''
+    }
   }
 
   const initialize = (state: Partial<IConnectionAgreementState>) => {
@@ -58,6 +193,12 @@ export const useConnectionAgreementStore = defineStore(namespace, () => {
     if (state.signedDocument !== undefined) {
       signedDocument.value = state.signedDocument
     }
+    if (state.coop !== undefined) {
+      coop.value = state.coop
+    }
+    if (state.formData !== undefined && state.formData !== null) {
+      formData.value = state.formData
+    }
   }
 
   return {
@@ -67,6 +208,11 @@ export const useConnectionAgreementStore = defineStore(namespace, () => {
     isInitialized,
     document,
     signedDocument,
+    currentInstance,
+    currentInstanceLoading,
+    currentInstanceError,
+    coop,
+    formData,
 
     // Methods
     setCurrentStep,
@@ -74,8 +220,18 @@ export const useConnectionAgreementStore = defineStore(namespace, () => {
     setInitialized,
     setDocument,
     setSignedDocument,
+    setCoop,
+    setFormData,
     reset,
-    initialize
+    initialize,
+
+    // Actions
+    generateDocument,
+    signDocument,
+    clearSignedDocument,
+    reloadCooperative,
+    loadCurrentInstance,
+    startInstanceAutoRefresh
   }
 }, {
   persist: true

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

@@ -7,10 +7,20 @@ export interface ITariff {
   additionalCosts?: string[]
 }
 
+export interface ICooperativeFormData {
+  announce: string
+  initial: string
+  minimum: string
+  org_initial: string
+  org_minimum: string
+}
+
 export interface IConnectionAgreementState {
   currentStep: number
   selectedTariff: ITariff | null
   isInitialized: boolean
   document?: any
   signedDocument?: any
-}
+  coop?: any
+  formData?: ICooperativeFormData
+}

package/src/features/Provider/model/index.ts

@@ -10,6 +10,7 @@ export interface HostingSubscriptionData {
   subscription_type_id: 1;
   progress: number;
   is_valid: boolean;
+  is_delegated: boolean;
 }
 
 /**
@@ -39,7 +40,7 @@ export function useProviderSubscriptions() {
   // Статус валидности домена для хостинг подписки (из specific_data)
   const domainValid = computed(() => {
     const specificData = hostingSubscription.value?.specific_data as SubscriptionSpecificData;
-    return specificData?.is_valid ?? null;
+    return (specificData?.is_valid && specificData?.is_delegated) ?? null;
   });
 
   // Прогресс установки для хостинг подписки (из specific_data)
@@ -58,6 +59,7 @@ export function useProviderSubscriptions() {
    */
   const loadSubscriptions = async () => {
     // Проверяем доступность провайдера
+    console.log('system.info', system.info);
     if (!system.info.is_providered) {
       error.value = 'Функционал провайдера не доступен';
       return;
@@ -67,6 +69,7 @@ export function useProviderSubscriptions() {
       isLoading.value = true;
       error.value = null;
       subscriptions.value = await loadProviderSubscriptions();
+      console.log('subscriptions', subscriptions.value);
     } catch (err: any) {
       error.value = err.message || 'Ошибка загрузки подписок';
       console.error('Error loading provider subscriptions:', err);

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

@@ -1,29 +1,34 @@
 <template lang="pug">
-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)]")
-
-  q-input(standout="bg-teal text-white" hint="100 RUB" label="Вступительный взнос для физлиц и ИП" v-model="data.params.initial" type="number" :min="0" :rules="[val => notEmpty(val)]")
-    template(#append)
-      span.text-overline {{currency}}
-
-  q-input(standout="bg-teal text-white" hint="300 RUB" label="Минимальный паевый взнос для физлиц и ИП" v-model="data.params.minimum" type="number" :min="0" :rules="[val => notEmpty(val)]")
-    template(#append)
-      span.text-overline {{currency}}
-
-  q-input(standout="bg-teal text-white" hint="1000 RUB" label="Вступительный взнос для организаций" v-model="data.params.org_initial" type="number" :min="0" :rules="[val => notEmpty(val)]")
-    template(#append)
-      span.text-overline {{currency}}
-
-  q-input(standout="bg-teal text-white" hint="3000 RUB" label="Минимальный паевый взнос для организаций" v-model="data.params.org_minimum" type="number" :min="0"  :rules="[val => notEmpty(val)]")
-    template(#append)
-      span.text-overline {{currency}}
+div
+  template(v-if="isSubmitting")
+    Loader(:text="'Создаем кооператив...'")
+  template(v-else)
+    Form(:handler-submit="addNow" :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)]")
+
+      q-input(standout="bg-teal text-white" hint="100 RUB" label="Вступительный взнос для физлиц и ИП" v-model="data.params.initial" type="number" :min="0" :rules="[val => notEmpty(val)]")
+        template(#append)
+          span.text-overline {{currency}}
+
+      q-input(standout="bg-teal text-white" hint="Минимальный паевый взнос для физлиц и ИП" v-model="data.params.minimum" type="number" :min="0" :rules="[val => notEmpty(val)]")
+        template(#append)
+          span.text-overline {{currency}}
+
+      q-input(standout="bg-teal text-white" hint="1000 RUB" label="Вступительный взнос для организаций" v-model="data.params.org_initial" type="number" :min="0" :rules="[val => notEmpty(val)]")
+        template(#append)
+          span.text-overline {{currency}}
+
+      q-input(standout="bg-teal text-white" hint="3000 RUB" label="Минимальный паевый взнос для организаций" v-model="data.params.org_minimum" type="number" :min="0"  :rules="[val => notEmpty(val)]")
+        template(#append)
+          span.text-overline {{currency}}
 
 </template>
 <script lang="ts" setup>
 import { computed, ref, watch } from 'vue';
 import { useAddCooperative } from '../model';
 import { Form } from 'src/shared/ui/Form';
+import { Loader } from 'src/shared/ui';
 import { notEmpty, isDomain } from 'src/shared/lib/utils';
 import { useSessionStore } from 'src/entities/Session';
 import { RegistratorContract } from 'cooptypes';
@@ -106,13 +111,17 @@ const clear = () => {
 
 const addNow = async () => {
   try {
+    isSubmitting.value = true
     data.value.document = {...document.value, meta: JSON.stringify(document.value.meta)}
     await addCooperative(data.value)
-    SuccessAlert('Документ подписан и отправлен')
+    SuccessAlert('Заявка на создание кооператива отправлена!')
 
+    // После успешной отправки переходим к следующему шагу
     clear()
   } catch(e: any){
     FailAlert(e)
+  } finally {
+    isSubmitting.value = false
   }
 }
 

package/src/features/Union/CooperativeDataForm/index.ts

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

package/src/features/Union/CooperativeDataForm/ui/CooperativeDataForm.vue

@@ -0,0 +1,69 @@
+<template lang="pug">
+div
+  Form(:handler-submit="saveData" :showCancel="false" :button-cancel-txt="'Отменить'" :button-submit-txt="'Продолжить'" @cancel="clear").q-gutter-md
+    q-input(standout="bg-teal text-white" hint="domovoy.com или coop.domovoy.com" label="Домен или поддомен для запуска" v-model="formData.announce" :rules="[val => notEmpty(val), val => isDomain(val)]")
+
+    q-input(standout="bg-teal text-white" placeholder="100" label="Вступительный взнос для физлиц и ИП" v-model="formData.initial" type="number" :min="0" :rules="[val => notEmpty(val)]")
+      template(#append)
+        span.text-overline RUB
+
+    q-input(standout="bg-teal text-white" label="Минимальный паевый взнос для физлиц и ИП" placeholder="300" v-model="formData.minimum" type="number" :min="0" :rules="[val => notEmpty(val)]")
+      template(#append)
+        span.text-overline RUB
+
+    q-input(standout="bg-teal text-white" placeholder="1000" label="Вступительный взнос для организаций" v-model="formData.org_initial" type="number" :min="0" :rules="[val => notEmpty(val)]")
+      template(#append)
+        span.text-overline RUB
+
+    q-input(standout="bg-teal text-white" placeholder="3000" label="Минимальный паевый взнос для организаций" v-model="formData.org_minimum" type="number" :min="0"  :rules="[val => notEmpty(val)]")
+      template(#append)
+        span.text-overline RUB
+</template>
+<script lang="ts" setup>
+import { ref, watch } from 'vue'
+import { Form } from 'src/shared/ui/Form';
+import { notEmpty, isDomain } from 'src/shared/lib/utils';
+import { useConnectionAgreementStore } from 'src/entities/ConnectionAgreement';
+import type { ICooperativeFormData } from 'src/entities/ConnectionAgreement/model/types';
+
+
+const emit = defineEmits(['continue'])
+
+const connectionAgreement = useConnectionAgreementStore()
+
+// Локальное состояние формы для избежания проблем с реактивностью
+const formData = ref<ICooperativeFormData>({
+  announce: connectionAgreement.formData.announce || '',
+  initial: connectionAgreement.formData.initial || '',
+  minimum: connectionAgreement.formData.minimum || '',
+  org_initial: connectionAgreement.formData.org_initial || '',
+  org_minimum: connectionAgreement.formData.org_minimum || ''
+})
+
+// Синхронизируем локальное состояние с изменениями в store
+watch(() => connectionAgreement.formData, (newFormData) => {
+  formData.value = {
+    announce: newFormData.announce || '',
+    initial: newFormData.initial || '',
+    minimum: newFormData.minimum || '',
+    org_initial: newFormData.org_initial || '',
+    org_minimum: newFormData.org_minimum || ''
+  }
+}, { deep: true })
+
+// Синхронизируем локальное состояние с store при изменении
+const syncFormData = () => {
+  connectionAgreement.setFormData(formData.value)
+}
+
+const clear = () => {
+  emit('continue')
+}
+
+const saveData = async () => {
+  console.log('📤 CooperativeDataForm: Данные формы:', formData.value)
+  // Синхронизируем данные с store перед отправкой
+  syncFormData()
+  emit('continue', formData.value)
+}
+</script>

package/src/features/Union/CooperativeDataForm/ui/index.ts

@@ -0,0 +1 @@
+export { default as CooperativeDataForm } from './CooperativeDataForm.vue'