@coopenomics/desktop 2.2.8 → 2.2.10

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.2.10](https://github.com/coopenomics/mono/compare/v2.2.9...v2.2.10) (2025-03-27)
+
+
+### Bug Fixes
+
+* add Zeus type ([7bcb6e3](https://github.com/coopenomics/mono/commit/7bcb6e30a77b0ab89c5293188b58f08f19c8761e))
+
+
+
+
+
+## [2.2.9](https://github.com/coopenomics/mono/compare/v2.2.8...v2.2.9) (2025-03-12)
+
+**Note:** Version bump only for package @coopenomics/desktop
+
+
+
+
+
 ## [2.2.8](https://github.com/coopenomics/monocoop/compare/v2.2.7...v2.2.8) (2025-02-10)
 
 **Note:** Version bump only for package @coopenomics/desktop

package/Env-testnet.ts

@@ -0,0 +1,12 @@
+export const BASE_URL = 'testnet.coopenomics.world';
+export const NODE_ENV = 'development';
+export const APP_NAME = 'COOPENOMICS';
+export const BACKEND_URL = 'https://testnet.coopenomics.world/backend';
+export const COOPNAME = 'voskhod';
+export const CURRENCY = 'RUB';
+export const STORAGE_URL = 'https://testnet.coopenomics.world/uploaded/';
+export const UPLOAD_URL = 'https://testnet.coopenomics.world/upload';
+export const CHAIN_URL = 'https://testnet.coopenomics.world/api';
+export const COOP_SHORT_NAME = 'Цифровой Кооператив';
+export const CHAIN_ID = 'f0364a3f9fd913081f1c0b05c6f8f50a59b2ba60bb928cb321ba3a9a36316624';
+export const SENTRY_DSN ='https://b8151ac0239b44339e0e8c65c9aa59c4@o245142.ingest.sentry.io/5739100';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coopenomics/desktop",
-  "version": "2.2.8",
+  "version": "2.2.10",
   "description": "A Desktop Project",
   "productName": "Desktop App",
   "author": "Alex Ant <dacom.dark.sun@gmail.com>",
@@ -20,8 +20,8 @@
     "prepublishOnly": "npm run build:lib"
   },
   "dependencies": {
-    "@coopenomics/controller": "2.2.8",
-    "@coopenomics/sdk": "2.2.8",
+    "@coopenomics/controller": "2.2.10",
+    "@coopenomics/sdk": "2.2.10",
     "@dicebear/collection": "^9.0.1",
     "@dicebear/core": "^9.0.1",
     "@fortawesome/fontawesome-svg-core": "^6.5.2",
@@ -45,7 +45,7 @@
     "@wharfkit/wallet-plugin-privatekey": "^1.1.0",
     "axios": "^1.2.1",
     "compression": "^1.7.4",
-    "cooptypes": "2.2.8",
+    "cooptypes": "2.2.10",
     "dompurify": "^3.1.7",
     "dotenv": "^16.4.5",
     "email-regex": "^5.0.0",
@@ -94,5 +94,5 @@
     "npm": ">= 6.13.4",
     "yarn": ">= 1.21.1"
   },
-  "gitHead": "973590281c916620f866b9e39253c6b5bf85f9d4"
+  "gitHead": "e5e28ff652112fe3bacb8036a898a1344ad361fa"
 }

package/src/boot/init-stores.ts

@@ -28,8 +28,14 @@ export default boot(async ({ router }) => {
   await cardStore.initWallet();
 
   // Загрузка аккаунта
-  if (session.isAuth && session.username)
-    await account.getAccount(session.username)
+  if (session.isAuth && session.username){
+    try {
+      await account.getAccount(session.username)
+    } catch(e){
+      session.close()
+    }
+  }
+
 
   // Добавление динамических маршрутов как дочерних к 'base'
   const baseRoute = router.getRoutes().find(route => route.name === 'base');

package/src/desktops/User/model/index.ts

@@ -160,16 +160,6 @@ export const manifest = {
 
         },
 
-        {
-          path: '/:coopname/contacts',
-          name: 'contacts',
-          component: markRaw(ContactsPage),
-          meta: {
-            title: 'Контакты',
-            icon: 'fa-solid fa-info',
-            roles: [],
-          },
-        },
         // {
         //   path: '/:coopname/marketplace',
         //   name: 'marketplace',
@@ -251,6 +241,17 @@ export const manifest = {
         //     },
         //   ],
         // },
+        {
+          path: '/:coopname/contacts',
+          name: 'contacts',
+          component: markRaw(ContactsPage),
+          meta: {
+            title: 'Контакты',
+            icon: 'fa-solid fa-info',
+            roles: [],
+          },
+        },
+
         // {
         //   meta: {
         //     title: 'Поддержка',

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

@@ -1,6 +1,6 @@
 import { client } from 'src/shared/api/client';
 import { Queries } from '@coopenomics/sdk';
-import type { IAccount } from '../types';
+import type { IAccount, IAccounts, IGetAccounts } from '../types';
 
 async function getAccount(username: string): Promise<IAccount | undefined> {
   const { [Queries.Accounts.GetAccount.name]: output } = await client.Query(Queries.Accounts.GetAccount.query, {
@@ -12,6 +12,15 @@ async function getAccount(username: string): Promise<IAccount | undefined> {
   return output;
 }
 
+async function getAccounts(variables?: IGetAccounts): Promise<IAccounts> {
+  const { [Queries.Accounts.GetAccounts.name]: output } = await client.Query(Queries.Accounts.GetAccounts.query, {
+    variables
+  });
+
+  return output;
+}
+
 export const api ={
-  getAccount
+  getAccount,
+  getAccounts
 }

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

@@ -1,25 +1,35 @@
 import { defineStore } from 'pinia'
 import { ref, Ref } from 'vue'
 import { api } from '../api'
-import type { IAccount } from '../types';
+import type { IAccount, IAccounts, IGetAccounts } from '../types';
 
 const namespace = 'accountStore';
 
-interface ISystemStore {
+interface IAccountStore {
   account: Ref<IAccount | undefined>
+  accounts: Ref<IAccounts>
   getAccount: (username: string) => Promise<IAccount | undefined>;
+  getAccounts: (data?: IGetAccounts) => Promise<IAccounts>;
 }
 
-export const useAccountStore = defineStore(namespace, (): ISystemStore => {
+export const useAccountStore = defineStore(namespace, (): IAccountStore => {
   const account = ref<IAccount>()
+  const accounts = ref<IAccounts>({items: [], totalCount: 0, totalPages: 0, currentPage: 1})
 
-  const getAccount = async (username: string) => {
+  const getAccount = async (username: string): Promise<IAccount | undefined> => {
     account.value = await api.getAccount(username);
     return account.value
   };
+  
+  const getAccounts = async(data?: IGetAccounts): Promise<IAccounts> => {
+    accounts.value = await api.getAccounts(data);
+    return accounts.value
+  }
 
   return {
     account,
-    getAccount
+    accounts,
+    getAccount,
+    getAccounts
   }
 })

package/src/entities/Account/types/index.ts

@@ -1,3 +1,11 @@
-import { Queries } from '@coopenomics/sdk';
+import { Queries, Zeus } from '@coopenomics/sdk';
 
 export type IAccount = Queries.Accounts.GetAccount.IOutput[typeof Queries.Accounts.GetAccount.name]
+export type IAccounts = Queries.Accounts.GetAccounts.IOutput[typeof Queries.Accounts.GetAccounts.name]
+export type IGetAccounts = {data?: Queries.Accounts.GetAccounts.IInput['data'], options?: Queries.Accounts.GetAccounts.IInput['options']}
+
+export const AccountTypes = Zeus.AccountType
+
+export type IIndividualData = Zeus.ModelTypes['Individual']
+export type IOrganizationData = Zeus.ModelTypes['Organization']
+export type IEntrepreneurData = Zeus.ModelTypes['Entrepreneur']

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

@@ -57,8 +57,6 @@ export const useSessionStore = defineStore('session', (): ISessionStore => {
       await globalStore.init();
       isAuth.value = globalStore.hasCreditials;
 
-      //TODO добавить более детальную проверку авторизации
-
       getInfo();
 
       try {
@@ -80,7 +78,8 @@ export const useSessionStore = defineStore('session', (): ISessionStore => {
       } catch (e: any) {
         console.error(e);
         FailAlert(e.message);
-        //TODO logout
+        close()
+        globalStore.logout()
       }
     }
   };

package/src/features/Account/UpdateAccount/api/index.ts

@@ -0,0 +1,14 @@
+import { client } from 'src/shared/api/client'
+import { Mutations } from '@coopenomics/sdk'
+
+async function updateAccount(data: Mutations.Accounts.UpdateAccount.IInput['data']): Promise<Mutations.Accounts.UpdateAccount.IOutput[[typeof Mutations.Accounts.UpdateAccount.name][number]]>{
+  const {[Mutations.Accounts.UpdateAccount.name]: result} = await client.Mutation(Mutations.Accounts.UpdateAccount.mutation, {variables: {
+    data
+  }})
+
+  return result
+}
+
+export const api = {
+  updateAccount
+}

package/src/features/Account/UpdateAccount/index.ts

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

package/src/features/Account/UpdateAccount/model/index.ts

@@ -0,0 +1,16 @@
+import type { Mutations } from '@coopenomics/sdk';
+import { api } from '../api'
+import { IAccount } from 'src/entities/Account/types';
+
+export type IUpdateAccountInput = Mutations.Accounts.UpdateAccount.IInput['data']
+
+export function useUpdateAccount() {
+
+  async function updateAccount(data: IUpdateAccountInput): Promise<IAccount> {
+    const account = await api.updateAccount(data);
+
+    return account;
+  }
+
+  return { updateAccount };
+}

package/src/features/Branch/SelectBranch/ui/SelectBranchOverlay.vue

@@ -60,8 +60,9 @@ div
   }
 
   const back = () => step.value--
-
-  branchStore.loadPublicBranches({ coopname: system.info.coopname })
+  
+  if (session.isAuth)
+    branchStore.loadPublicBranches({ coopname: system.info.coopname })
 
   const generate = async () => {
     isLoading.value = true

package/src/features/PaymentMethod/UpdateBankAccount/api/index.ts

@@ -2,6 +2,7 @@ import { client } from 'src/shared/api/client'
 import { Mutations } from '@coopenomics/sdk'
 
 async function updateBankAccount(data: Mutations.PaymentMethods.UpdateBankAccount.IInput['data']): Promise<Mutations.PaymentMethods.UpdateBankAccount.IOutput[typeof Mutations.PaymentMethods.UpdateBankAccount.name]>{
+  console.log('data on update', data)
   const {updateBankAccount: result} = await client.Mutation(Mutations.PaymentMethods.UpdateBankAccount.mutation, {variables: {
     data
   }})

package/src/features/PaymentMethod/UpdateBankAccount/model/index.ts

@@ -1,10 +1,9 @@
 import { api } from '../api';
-import { Mutations } from '@coopenomics/sdk'
 
 export interface IBankTransferData {
   account_number: string;
   bank_name: string;
-  card_number?: string;
+  card_number?: string | null;
   currency: string;
   details: {
     bik: string;
@@ -18,14 +17,22 @@ export interface IUpdateBranchBankAccount {
   method_id: string;
   method_type: string;
   data: IBankTransferData;
+  is_default: boolean;
+  created_at: Date;
+  updated_at: Date;
 }
 
 
 export function useUpdateBranchBankAccount() {
 
-  async function updateBankAccount(data: Mutations.PaymentMethods.UpdateBankAccount.IInput['data']) {
+  async function updateBankAccount(data: IUpdateBranchBankAccount) {
     data.is_default = true
-    return await api.updateBankAccount(data)
+
+    // Убираем ненужные поля TODO: очевидно что так делать не надо
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const { created_at, updated_at, method_type, ...rest } = data;
+
+    return await api.updateBankAccount(rest)
   }
 
   return {

package/src/features/Request/CreateChildOrder/ui/CreateChildOrderButton/CreateChildOrderButton.vue

@@ -11,7 +11,7 @@
 
   const createOrder = async () => {
     try {
-
+      //TODO: запрос должен быть корректным на основе информации из бч
       const document = await api.generateReturnByAssetStatement({
         coopname: props.coopname,
         request: {

package/src/features/User/AddUser/ui/AddUserDialog/AddUserDialog.vue

@@ -99,6 +99,7 @@ import { useSystemStore } from 'src/entities/System/model';
 const { info } = useSystemStore()
 
 import { notEmpty } from 'src/shared/lib/utils';
+import { useAccountStore } from 'src/entities/Account/model';
 
 const { state, addUserState, clearUserData } = useRegistratorStore()
 const spread_minimum = ref(true) //TODO REPLACE IT!
@@ -204,6 +205,7 @@ const addUserNow = (userDataForm: any) => {
   userDataForm.validate().then(async (success: boolean) => {
     if (success) {
       try {
+        const accountStore = useAccountStore()
         loading.value = true
         await addUser()
         SuccessAlert('Пайщик добавлен в реестр, а приглашение отправлено на его email');
@@ -211,6 +213,7 @@ const addUserNow = (userDataForm: any) => {
         addUserState.created_at = ''
         clearUserData()
         loading.value = false
+        accountStore.getAccounts()
       } catch (e: any) {
         loading.value = false
         FailAlert(`Возникла ошибка: ${e.message}`)

package/src/features/User/Logout/model/index.ts

@@ -1,13 +1,13 @@
 import { useSessionStore } from 'src/entities/Session'
 import { useGlobalStore } from 'src/shared/store'
-import { api } from '../api'
+// import { api } from '../api'
 import { useCurrentUserStore } from 'src/entities/User'
 
 export function useLogoutUser() {
   async function logout(): Promise<void> {
     const global = useGlobalStore()
-
-    if (global.tokens?.refresh.token) await api.logoutUser(global.tokens?.refresh.token)
+    //TODO: "начать с начала" при регистрации бажит на это - да и в целом пора бы маршруты срезать эти
+    // if (global.tokens?.refresh.token) await api.logoutUser(global.tokens?.refresh.token)
 
     await global.logout()
 

package/src/pages/Cooperative/ListOfBranches/ui/ListOfBranchesPage.vue

@@ -53,11 +53,9 @@ div
               BankDetailsCard(:bankDetails="props.row.bank_account")
             div.col-md-4.col-xs-12.q-pa-sm
               p.text-center.text-overline карточка председателя
-              IndividualCard(:individual="props.row.trustee" :readonly="true").q-mt-sm
+              EditableIndividualCard(:participantData="props.row.trustee" :readonly="true").q-mt-sm
               div.text-wrap
                 p.text-grey для замены председателя участка - измените его имя аккаунта в карточке участка на аккаунт одного из пайщиков.
-
-
 </template>
 
 <script lang="ts" setup>
@@ -67,7 +65,7 @@ import { useEditableTableRows } from 'src/shared/lib/composables/useEditableTabl
 import { CreateBranchButton } from 'src/features/Branch/CreateBranch';
 import { getNameFromUserData } from 'src/shared/lib/utils/getNameFromUserData';
 import { BranchCard } from 'src/widgets/BranchCard';
-import { IndividualCard } from 'src/widgets/IndividualCard';
+import { EditableIndividualCard } from 'src/shared/ui/EditableIndividualCard';
 import { BankDetailsCard } from 'src/widgets/BankDetailsCard';
 import { useSystemStore } from 'src/entities/System/model';
 const { info } = useSystemStore()

package/src/pages/Marketplace/OfferPage/ui/OfferPage.vue

@@ -15,11 +15,11 @@ div(v-if="localRequest").row.justify-around.q-pt-lg
       div.q-pa-md
         q-input(v-model="localRequest.remain_units" :readonly="!showEdit" standout="bg-teal text-white" label="Остаток" type="number")
           template(#append)
-            p единиц
+            span единиц
 
         q-input(v-model="price" :readonly="!showEdit" standout="bg-teal text-white" label="Цена" type="number" step="100" min="0")
           template(#append)
-            p {{ symbol }}
+            span {{ symbol }}
 
     div(v-if="isMy")
       div(v-if="loggedIn")

package/src/shared/lib/composables/useEditableData.ts

@@ -21,7 +21,7 @@ export function useEditableData<T extends Record<string, any>>(
 
   // Автоматически отслеживаем изменения в editableData
   watch(
-    () => editableData,
+    editableData,
     (newData) => {
       isEditing.value = !isEqual(newData.value, originalData.value); // Глубокое сравнение объектов
       validateForm(); // Проверка валидности формы при изменении данных

package/src/shared/lib/consts/workspaces/index.ts

@@ -1 +1,2 @@
 export const agreementsBase = ['wallet', 'signature', 'privacy', 'user']
+export const sosediProgram = ['sosedi']

package/src/shared/ui/EditableEntrepreneurCard/EditableEntrepreneurCard.vue

@@ -0,0 +1,170 @@
+<template lang="pug">
+q-form(ref="form")
+  q-input(
+    dense
+    v-model="data.last_name"
+    standout="bg-teal text-white"
+    label="Фамилия"
+    :readonly="readonly"
+    :rules="[val => notEmpty(val), val => validatePersonalName(val)]"
+    autocomplete="off"
+  )
+  q-input(
+    dense
+    v-model="data.first_name"
+    standout="bg-teal text-white"
+    label="Имя"
+    :readonly="readonly"
+    :rules="[val => notEmpty(val), val => validatePersonalName(val)]"
+    autocomplete="off"
+  )
+  q-input(
+    dense
+    v-model="data.middle_name"
+    standout="bg-teal text-white"
+    label="Отчество"
+    :readonly="readonly"
+    :rules="[val => validatePersonalName(val)]"
+    autocomplete="off"
+  )
+
+  q-input(
+    dense
+    v-model="data.birthdate"
+    standout="bg-teal text-white"
+    mask="date"
+    label="Дата рождения"
+    placeholder="Формат: год/месяц/день"
+    :readonly="readonly"
+    :rules="['date', val => notEmpty(val)]"
+    autocomplete="off"
+  )
+    template(v-slot:append)
+      q-icon(name="event" class="cursor-pointer" v-if="!readonly")
+        q-popup-proxy(cover transition-show="scale" transition-hide="scale")
+          q-date(v-model="data.birthdate")
+            .row.items-center.justify-end
+              q-btn(v-close-popup label="Закрыть" color="primary" flat)
+
+  q-input(
+    dense
+    v-model="data.phone"
+    standout="bg-teal text-white"
+    label="Номер телефона"
+    mask="+7 (###) ###-##-##"
+    fill-mask
+    :readonly="readonly"
+    :rules="[val => notEmpty(val), val => notEmptyPhone(val)]"
+    autocomplete="off"
+  )
+
+  q-select(
+    dense
+    v-model="data.country"
+    standout="bg-teal text-white"
+    label="Страна"
+    :options="[{ label: 'Российская Федерация', value: 'Российская Федерация' }]"
+    map-options
+    emit-value
+    :readonly="readonly"
+    :rules="[val => notEmpty(val)]"
+  )
+
+  q-input(
+    dense
+    v-model="data.city"
+    standout="bg-teal text-white"
+    label="Город"
+    :readonly="readonly"
+    :rules="[val => notEmpty(val)]"
+    autocomplete="off"
+  )
+
+  q-input(
+    dense
+    v-model="data.full_address"
+    standout="bg-teal text-white"
+    label="Адрес регистрации"
+    :readonly="readonly"
+    :rules="[val => notEmpty(val)]"
+    autocomplete="off"
+  )
+
+  q-input(
+    dense
+    v-model="data.details.inn"
+    standout="bg-teal text-white"
+    mask="############"
+    label="ИНН предпринимателя"
+    :readonly="readonly"
+    :rules="[val => notEmpty(val), val => (val.length === 10 || val.length === 12) || 'ИНН должен содержать 10 или 12 цифр']"
+    autocomplete="off"
+  )
+
+  q-input(
+    dense
+    v-model="data.details.ogrn"
+    standout="bg-teal text-white"
+    mask="###############"
+    label="ОГРНИП"
+    :readonly="readonly"
+    :rules="[val => notEmpty(val), val => (val.length === 13 || val.length === 15) || 'ОГРНИП должен содержать 13 или 15 цифр']"
+    autocomplete="off"
+  )
+
+  EditableActions(
+    v-if="!readonly"
+    :isEditing="isEditing"
+    :isDisabled="isDisabled"
+    @save="saveChanges"
+    @cancel="cancelChanges"
+  )
+</template>
+
+<script setup lang="ts">
+  import { ref } from 'vue';
+  import { useEditableData } from 'src/shared/lib/composables/useEditableData';
+  import { notEmpty, notEmptyPhone, validatePersonalName } from 'src/shared/lib/utils';
+  import { failAlert, SuccessAlert } from 'src/shared/api';
+  import { EditableActions } from 'src/shared/ui/EditableActions';
+  import { type IUpdateAccountInput, useUpdateAccount } from 'src/features/Account/UpdateAccount/model';
+  import { type IEntrepreneurData } from 'src/entities/Account/types';
+  
+  const emit = defineEmits(['update']);
+  const { updateAccount } = useUpdateAccount();
+  
+  const props = defineProps({
+    participantData: {
+      type: Object as () => IEntrepreneurData,
+      required: true
+    },
+    readonly: {
+      type: Boolean,
+      default: false
+    }
+  });
+  
+  const localEntrepreneurData = ref(props.participantData);
+  const form = ref();
+  
+  const handleSave = async () => {
+    try {
+      const account_data: IUpdateAccountInput = {
+        username: props.participantData.username,
+        entrepreneur_data: data.value,
+      };
+      await updateAccount(account_data);
+      emit('update', JSON.parse(JSON.stringify(data.value)));
+      SuccessAlert('Данные аккаунта обновлены');
+    } catch (e) {
+      console.log(e);
+      failAlert(e);
+    }
+  };
+  
+  const { editableData: data, isEditing, isDisabled, saveChanges, cancelChanges } = useEditableData(
+    localEntrepreneurData.value,
+    handleSave,
+    form
+  );
+</script>

package/src/shared/ui/EditableEntrepreneurCard/index.ts

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