@coopenomics/desktop 2025.7.3 → 2025.11.8-alpha-2

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

@@ -1,12 +1,11 @@
 import { defineStore } from 'pinia';
 import { computed, reactive } from 'vue';
 import { IGeneratedAccount } from 'src/shared/lib/types/user';
-import { type IRegisterAccount } from 'src/shared/lib/types/user/IUserData';
+import { type IUserData } from 'src/shared/lib/types/user/IUserData';
 import type { Cooperative } from 'cooptypes';
 import { useSystemStore } from 'src/entities/System/model';
 import type { IDocument, ISignatureInfo } from 'src/shared/lib/types/document';
 import { Zeus } from '@coopenomics/sdk';
-import { AccountTypes } from 'src/entities/Account/types';
 import type { IInitialPaymentOrder } from 'src/shared/lib/types/payments';
 
 const namespace = 'registrator';
@@ -19,11 +18,8 @@ const initialAccountState: IGeneratedAccount = {
 };
 
 // Начальное состояние для userData
-const initialUserDataState: IRegisterAccount = {
-  email: '',
-  username: '',
-  public_key: '',
-  type: AccountTypes.individual,
+const initialUserDataState: IUserData = {
+  type: null,
   individual_data: {
     first_name: '',
     last_name: '',

package/src/entities/Session/composables/useCurrentUser.ts

@@ -30,6 +30,7 @@ export function useCurrentUser() {
     isRegistrationComplete: computed(() => session.isRegistrationComplete),
     isChairman: session.isChairman,
     isMember: session.isMember,
+    isAuth: session.isAuth,
 
     // Методы
     setCurrentUserAccount: session.setCurrentUserAccount,

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

@@ -3,9 +3,8 @@ import { useGlobalStore } from 'src/shared/store';
 import { computed, ComputedRef, Ref, ref } from 'vue';
 import { Session } from '@wharfkit/session';
 import { WalletPluginPrivateKey } from '@wharfkit/wallet-plugin-privatekey';
-import { FailAlert, readBlockchain } from 'src/shared/api';
-import { PrivateKey, Serializer } from '@wharfkit/antelope';
-import { GetInfoResult } from 'eosjs/dist/eosjs-rpc-interfaces';
+import { FailAlert } from 'src/shared/api';
+import { PrivateKey } from '@wharfkit/antelope';
 import { env } from 'src/shared/config';
 import type { IAccount } from 'src/entities/Account/types';
 
@@ -16,11 +15,6 @@ interface ISessionStore {
   //TODO add Blockchain Session here
   session: Ref<Session | undefined>;
   close: () => Promise<void>;
-  BCInfo: Ref<{
-    connected: boolean;
-    info: GetInfoResult | undefined;
-  }>;
-  getInfo: () => Promise<void>;
   loadComplete: Ref<boolean>;
   // Добавляю данные текущего пользователя
   currentUserAccount: Ref<IAccount | undefined>;
@@ -38,22 +32,6 @@ export const useSessionStore = defineStore('session', (): ISessionStore => {
   const currentUserAccount = ref<IAccount | undefined>();
 
   const session = ref();
-  const BCInfo = ref<{
-    connected: boolean;
-    info: GetInfoResult | undefined;
-  }>({ connected: false, info: undefined });
-
-  const getInfo = async () => {
-    try {
-      const info = await readBlockchain.v1.chain.get_info();
-      if (info) {
-        BCInfo.value.info = Serializer.objectify(info);
-        BCInfo.value.connected = true;
-      }
-    } catch (e) {
-      BCInfo.value = { connected: false, info: undefined };
-    }
-  };
 
   const setCurrentUserAccount = (account: IAccount | undefined) => {
     currentUserAccount.value = account;
@@ -71,8 +49,6 @@ export const useSessionStore = defineStore('session', (): ISessionStore => {
       await globalStore.init();
       isAuth.value = globalStore.hasCreditials;
 
-      getInfo();
-
       try {
         if (globalStore.hasCreditials) {
           session.value = new Session({
@@ -117,10 +93,8 @@ export const useSessionStore = defineStore('session', (): ISessionStore => {
     isAuth,
     init,
     session,
-    BCInfo,
     username,
     close,
-    getInfo,
     loadComplete,
     currentUserAccount,
     setCurrentUserAccount,

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

@@ -1,24 +1,73 @@
-import { defineStore } from 'pinia'
-import { ref, Ref } from 'vue'
-import { api } from '../api'
+import { defineStore } from 'pinia';
+import { ref, Ref, triggerRef } from 'vue';
+import { api } from '../api';
 import type { ISystemInfo } from '../types';
+import { Zeus } from '@coopenomics/sdk';
 
 const namespace = 'systemStore';
 
 interface ISystemStore {
-  info: Ref<ISystemInfo>
+  info: Ref<ISystemInfo>;
+  backendAvailable: Ref<boolean>;
+  maintenanceCounter: Ref<number>;
   loadSystemInfo: () => Promise<void>;
+  startSystemMonitoring: () => void;
+  stopSystemMonitoring: () => void;
 }
 
 export const useSystemStore = defineStore(namespace, (): ISystemStore => {
-  const info = ref<ISystemInfo>({} as ISystemInfo)
+  const info = ref<ISystemInfo>({
+    system_status: 'active', // Начальное значение
+  } as ISystemInfo);
+  const backendAvailable = ref<boolean>(true);
+  const maintenanceCounter = ref<number>(0); // Счетчик для принудительного обновления
+  let monitoringInterval: ReturnType<typeof setInterval> | null = null;
 
   const loadSystemInfo = async () => {
-    info.value = await api.loadSystemInfo();
+    try {
+      info.value = await api.loadSystemInfo();
+      backendAvailable.value = true;
+      triggerRef(info); // Принудительно триггерим реактивность
+    } catch (error) {
+      console.warn('Failed to load system info, backend might be unavailable:', error);
+      backendAvailable.value = false;
+      // При недоступности бэкенда устанавливаем статус обслуживания
+      info.value.system_status = Zeus.SystemStatus.maintenance;
+      throw error; // Перебрасываем ошибку для обработки выше
+    }
+  };
+
+  const startSystemMonitoring = () => {
+    // Останавливаем существующий мониторинг, если он есть
+    stopSystemMonitoring();
+
+    // Запускаем периодическую проверку каждые 10 секунд
+    monitoringInterval = setInterval(async () => {
+      try {
+        await loadSystemInfo();
+      } catch (error) {
+        console.warn('Failed to update system info during monitoring:', error);
+        // При недоступности бэкенда устанавливаем статус обслуживания
+        backendAvailable.value = false;
+        info.value.system_status = Zeus.SystemStatus.maintenance; // Обновляем статус напрямую
+        maintenanceCounter.value++; // Увеличиваем счетчик для триггера watch
+      }
+    }, 10000);
+  };
+
+  const stopSystemMonitoring = () => {
+    if (monitoringInterval) {
+      clearInterval(monitoringInterval);
+      monitoringInterval = null;
+    }
   };
 
   return {
     info,
-    loadSystemInfo
-  }
-})
+    backendAvailable,
+    maintenanceCounter,
+    loadSystemInfo,
+    startSystemMonitoring,
+    stopSystemMonitoring,
+  };
+});

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

@@ -1,6 +1,10 @@
 import { RegistratorContract } from 'cooptypes';
 import { AccountResult } from 'eosjs/dist/eosjs-rpc-interfaces';
-import { IEntrepreneurData, IIndividualData, IOrganizationData } from 'src/shared/lib/types/user/IUserData';
+import {
+  IEntrepreneurData,
+  IIndividualData,
+  IOrganizationData,
+} from 'src/shared/lib/types/user/IUserData';
 
 export interface ILoadPrivateProfile {
   coopname: string;
@@ -18,7 +22,14 @@ export interface IPrivateProfile {
 
 export interface IUserAccountData {
   username: string;
-  status: 'created' | 'joined' | 'payed' | 'registered' | 'active' | 'blocked' | 'failed';
+  status:
+    | 'created'
+    | 'joined'
+    | 'payed'
+    | 'registered'
+    | 'active'
+    | 'blocked'
+    | 'failed';
   is_registered: boolean;
   type: 'individual' | 'entrepreneur' | 'organization';
   public_key: string;
@@ -26,6 +37,8 @@ export interface IUserAccountData {
   email: string;
   role: string;
   is_email_verified: boolean;
+  subscriber_id?: string;
+  subscriber_hash?: string;
   private_data: IIndividualData | IEntrepreneurData | IOrganizationData | null;
 }
 

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

@@ -0,0 +1,40 @@
+import { Queries } from '@coopenomics/sdk';
+import { client } from 'src/shared/api/client';
+import type {
+  IWebPushSubscription,
+  ISubscriptionStats,
+  IGetUserSubscriptionsInput,
+} from '../model/types';
+
+/**
+ * Получение подписок пользователя
+ */
+async function getUserWebPushSubscriptions(
+  data: IGetUserSubscriptionsInput,
+): Promise<IWebPushSubscription[]> {
+  const { [Queries.Notification.GetUserWebPushSubscriptions.name]: result } =
+    await client.Query(Queries.Notification.GetUserWebPushSubscriptions.query, {
+      variables: {
+        data,
+      },
+    });
+
+  return result;
+}
+
+/**
+ * Получение статистики подписок (только для председателя)
+ */
+async function getWebPushSubscriptionStats(): Promise<ISubscriptionStats> {
+  const { [Queries.Notification.GetWebPushSubscriptionStats.name]: result } =
+    await client.Query(Queries.Notification.GetWebPushSubscriptionStats.query, {
+      variables: {},
+    });
+
+  return result;
+}
+
+export const webPushSubscriptionApi = {
+  getUserWebPushSubscriptions,
+  getWebPushSubscriptionStats,
+};

package/src/entities/WebPushSubscription/index.ts

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

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

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

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

@@ -0,0 +1,60 @@
+import { defineStore } from 'pinia';
+import { ref, computed } from 'vue';
+import type {
+  IWebPushSubscription,
+  ISubscriptionState,
+  IPushNotificationSupport,
+} from './types';
+
+export const useWebPushSubscriptionStore = defineStore(
+  'webPushSubscription',
+  () => {
+    // Состояние
+    const subscriptions = ref<IWebPushSubscription[]>([]);
+    const isLoading = ref(false);
+    const error = ref<string | null>(null);
+    const support = ref<IPushNotificationSupport>({
+      isSupported: false,
+      hasPermission: false,
+      permission: 'default',
+      hasServiceWorker: false,
+      canSubscribe: false,
+    });
+
+    // Состояние диалога разрешения уведомлений
+    const isPermissionDialogVisible = ref(false);
+    const isPermissionDialogProcessing = ref(false);
+
+    // Computed свойства
+    const activeSubscription = computed(() =>
+      subscriptions.value.find((sub) => sub.isActive),
+    );
+
+    const isSubscribed = computed(() => Boolean(activeSubscription.value));
+
+    const subscriptionState = computed<ISubscriptionState>(() => ({
+      isSubscribed: isSubscribed.value,
+      subscription: activeSubscription.value || null,
+      isLoading: isLoading.value,
+      error: error.value,
+      support: support.value,
+    }));
+
+    return {
+      // Состояние
+      subscriptions,
+      isLoading,
+      error,
+      support,
+
+      // Состояние диалога разрешения уведомлений
+      isPermissionDialogVisible,
+      isPermissionDialogProcessing,
+
+      // Computed
+      activeSubscription,
+      isSubscribed,
+      subscriptionState,
+    };
+  },
+);

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

@@ -0,0 +1,54 @@
+import type { Queries, Mutations } from '@coopenomics/sdk';
+
+/**
+ * Типы данных для веб-пуш подписок из SDK
+ */
+export type IWebPushSubscription =
+  Queries.Notification.GetUserWebPushSubscriptions.IOutput[typeof Queries.Notification.GetUserWebPushSubscriptions.name][number];
+export type ISubscriptionStats =
+  Queries.Notification.GetWebPushSubscriptionStats.IOutput[typeof Queries.Notification.GetWebPushSubscriptionStats.name];
+export type ICreateSubscriptionResponse =
+  Mutations.Notification.CreateWebPushSubscription.IOutput[typeof Mutations.Notification.CreateWebPushSubscription.name];
+
+// Входные типы
+export type IGetUserSubscriptionsInput =
+  Queries.Notification.GetUserWebPushSubscriptions.IInput['data'];
+export type ICreateWebPushSubscriptionInput =
+  Mutations.Notification.CreateWebPushSubscription.IInput['data'];
+export type IDeactivateSubscriptionInput =
+  Mutations.Notification.DeactivateWebPushSubscriptionById.IInput['data'];
+
+/**
+ * Состояние поддержки push уведомлений браузером
+ */
+export interface IPushNotificationSupport {
+  isSupported: boolean;
+  hasPermission: boolean;
+  permission: NotificationPermission;
+  hasServiceWorker: boolean;
+  canSubscribe: boolean;
+  error?: string;
+}
+
+/**
+ * Данные для создания подписки
+ */
+export interface ICreateSubscriptionData {
+  endpoint: string;
+  keys: {
+    p256dh: string;
+    auth: string;
+  };
+  userAgent: string;
+}
+
+/**
+ * Состояние подписки пользователя
+ */
+export interface ISubscriptionState {
+  isSubscribed: boolean;
+  subscription: IWebPushSubscription | null;
+  isLoading: boolean;
+  error: string | null;
+  support: IPushNotificationSupport;
+}

package/src/env.d.ts

@@ -6,7 +6,6 @@ declare namespace NodeJS {
     VUE_ROUTER_MODE: 'hash' | 'history' | 'abstract' | undefined;
     VUE_ROUTER_BASE: string | undefined;
   }
-
 }
 
 declare global {
@@ -14,7 +13,6 @@ declare global {
     YooMoneyCheckoutWidget: any;
     chatwootSDK: any;
   }
-
 }
 
 import 'vue-router';
@@ -24,9 +22,10 @@ declare module 'vue-router' {
   interface RouteMeta {
     roles?: string[];
     conditions?: string;
-    agreements?: string[]
-    title: string
-    icon: string
-    requiresAuth?: boolean
+    agreements?: string[];
+    title: string;
+    icon: string;
+    requiresAuth?: boolean;
+    hidden?: boolean;
   }
 }

package/src/features/Agreementer/ConfirmAgreement/model/index.ts

@@ -0,0 +1,25 @@
+import { client } from 'src/shared/api/client';
+import { Mutations } from '@coopenomics/sdk';
+
+// Типы для мутации ConfirmAgreement
+export type IConfirmAgreementInput = Mutations.Agreements.ConfirmAgreement.IInput['data'];
+export type IConfirmAgreementOutput = Mutations.Agreements.ConfirmAgreement.IOutput[typeof Mutations.Agreements.ConfirmAgreement.name];
+
+export const useConfirmAgreement = () => {
+  const confirmAgreement = async (data: IConfirmAgreementInput): Promise<IConfirmAgreementOutput> => {
+    const { [Mutations.Agreements.ConfirmAgreement.name]: result } = await client.Mutation(
+      Mutations.Agreements.ConfirmAgreement.mutation,
+      {
+        variables: {
+          data
+        }
+      }
+    );
+
+    return result;
+  };
+
+  return {
+    confirmAgreement
+  };
+};

package/src/features/Agreementer/DeclineAgreement/model/index.ts

@@ -0,0 +1,25 @@
+import { client } from 'src/shared/api/client';
+import { Mutations } from '@coopenomics/sdk';
+
+// Типы для мутации DeclineAgreement
+export type IDeclineAgreementInput = Mutations.Agreements.DeclineAgreement.IInput['data'];
+export type IDeclineAgreementOutput = Mutations.Agreements.DeclineAgreement.IOutput[typeof Mutations.Agreements.DeclineAgreement.name];
+
+export const useDeclineAgreement = () => {
+  const declineAgreement = async (data: IDeclineAgreementInput): Promise<IDeclineAgreementOutput> => {
+    const { [Mutations.Agreements.DeclineAgreement.name]: result } = await client.Mutation(
+      Mutations.Agreements.DeclineAgreement.mutation,
+      {
+        variables: {
+          data
+        }
+      }
+    );
+
+    return result;
+  };
+
+  return {
+    declineAgreement
+  };
+};

package/src/features/Agreementer/ReadAgreementDialog/ui/ReadAgreementDialog.vue

@@ -1,5 +1,5 @@
 <template lang="pug">
-span(@click.stop='(event) => showDialog(event)' style="color: blue; text-decoration: underline;").q-ml-xs {{text}}
+span.agreement-link(@click.stop='(event) => showDialog(event)').q-ml-xs {{text}}
   q-dialog(v-model="show" persistent :maximized="true" )
     ModalBase(title="" :show_close="true")
       div.row.justify-center

package/src/features/Agreementer/SignAgreementDialog/ui/SignAgreementDialog.vue

@@ -1,10 +1,10 @@
 <template lang="pug">
 q-dialog(v-model="show" persistent :maximized="true" )
   ModalBase(:title="title" :show_close="false")
-    div.row.justify-center
-      div(style="padding-bottom: 100px;").col-md-8.col-col-xs-12
+    div(style="padding-bottom: 50px; padding-top: 50px;").row.justify-center
+      q-card(flat).col-md-8.col-col-xs-12
         Loader(v-if="isLoading" :text='`Формируем документ...`')
-        Form(:handler-submit="sign" :is-submitting="isSubmitting" :showSubmit="!isLoading" :showCancel="false" :button-submit-txt="'Подписать и отправить'" @cancel="clear").q-pa-md
+        Form(:handler-submit="sign" :is-submitting="isSubmitting" :showSubmit="!isLoading" :showCancel="false" :button-submit-txt="'Подписать и отправить'" @cancel="clear").q-pa-lg
           slot
 </template>
 

package/src/features/Agreementer/StaticPrivacyDialog/index.ts

@@ -0,0 +1 @@
+export { StaticPrivacyDialog } from './ui';

package/src/features/Agreementer/StaticPrivacyDialog/ui/StaticPrivacyDialog.vue

@@ -0,0 +1,47 @@
+<template lang="pug">
+span.agreement-link(@click.stop='(event) => showDialog(event)').q-ml-xs {{text}}
+  q-dialog(v-model="show" persistent :maximized="true" )
+    ModalBase(title="" :show_close="true")
+      div.row.justify-center
+        div(style="padding-bottom: 100px;").col-md-8.col-col-xs-12
+          Form(:handler-submit="ok" :is-submitting="isSubmitting" :showSubmit="true" :showCancel="true" button-cancel-text="Отменить" button-submit-txt="Подтвердить" @cancel="clear").q-pa-md
+            StaticPrivacyPolicy
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import { ModalBase } from 'src/shared/ui/ModalBase';
+import { Form } from 'src/shared/ui/Form';
+import { StaticPrivacyPolicy } from 'src/features/Agreementer/StaticPrivacyPolicy';
+
+const emit = defineEmits(['update:agree']);
+
+const show = ref(false);
+const isSubmitting = ref(false);
+
+const ok = async() => {
+  emit('update:agree', true);
+  show.value = false;
+};
+
+const clear = () => {
+  emit('update:agree', false);
+  show.value = false;
+};
+
+defineProps({
+  agree: {
+    type: Boolean,
+    required: true,
+  },
+  text: {
+    type: String,
+    required: true
+  }
+});
+
+const showDialog = (event: Event) => {
+  event.stopPropagation();
+  show.value = true;
+};
+</script>

package/src/features/Agreementer/StaticPrivacyDialog/ui/index.ts

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

package/src/features/Agreementer/StaticPrivacyPolicy/index.ts

@@ -0,0 +1 @@
+export { StaticPrivacyPolicy } from './ui';

package/src/features/Agreementer/StaticPrivacyPolicy/ui/StaticPrivacyPolicy.vue

@@ -0,0 +1,61 @@
+<template lang="pug">
+div
+  DocumentHtmlReader(:html="privacyPolicyHtml")
+
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+import { useSystemStore } from 'src/entities/System/model';
+import { DocumentHtmlReader } from 'src/shared/ui/DocumentHtmlReader';
+import { Cooperative } from 'cooptypes';
+
+const { info } = useSystemStore();
+
+// Получаем шаблон Privacy Policy из cooptypes
+const privacyPolicyTemplate = Cooperative.Registry.PrivacyPolicy;
+
+const privacyPolicyHtml = computed(() => {
+  if (!info || !info.vars) {
+    return '<div>Загрузка политики конфиденциальности...</div>';
+  }
+
+  const vars = info.vars;
+  const contacts = info.contacts;
+
+  // Получаем переводы для русского языка
+  const translation = privacyPolicyTemplate.translations.ru;
+
+  // Функция для замены плейсхолдеров в тексте
+  const replacePlaceholders = (text: string): string => {
+    return text
+      .replace(/\{\{\s*vars\.full_abbr_dative\s*\}\}/g, vars.full_abbr_dative || '')
+      .replace(/\{\{\s*vars\.name\s*\}\}/g, vars.name || '')
+      .replace(/\{\{\s*vars\.website\s*\}\}/g, vars.website || '')
+      .replace(/\{\{\s*vars\.short_abbr\s*\}\}/g, vars.short_abbr || '')
+      .replace(/\{\{\s*vars\.confidential_email\s*\}\}/g, vars.confidential_email || '')
+      .replace(/\{\{\s*vars\.confidential_link\s*\}\}/g, vars.confidential_link || '')
+      .replace(/\{\{\s*vars\.privacy_agreement\.protocol_number\s*\}\}/g, vars.privacy_agreement?.protocol_number || '')
+      .replace(/\{\{\s*vars\.privacy_agreement\.protocol_day_month_year\s*\}\}/g, vars.privacy_agreement?.protocol_day_month_year || '')
+      .replace(/\{\{\s*coop\.short_name\s*\}\}/g, contacts?.full_name || '');
+  };
+
+  // Функция для замены переводов
+  const replaceTranslations = (html: string): string => {
+    let result = html;
+    Object.entries(translation).forEach(([key, value]) => {
+      // Заменяем {% trans 'key' %} на соответствующий перевод
+      const regex = new RegExp(`\\{\\%\\s*trans\\s*'${key}'\\s*\\%\\}`, 'g');
+      result = result.replace(regex, value);
+    });
+    return result;
+  };
+
+  // Применяем замены
+  let html = privacyPolicyTemplate.context;
+  html = replaceTranslations(html);
+  html = replacePlaceholders(html);
+
+  return html;
+});
+</script>

package/src/features/Agreementer/StaticPrivacyPolicy/ui/index.ts

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