@coopenomics/desktop 2025.6.14 → 2025.6.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coopenomics/desktop",
-  "version": "2025.6.14",
+  "version": "2025.6.24",
   "description": "A Desktop Project",
   "productName": "Desktop App",
   "author": "Alex Ant <dacom.dark.sun@gmail.com>",
@@ -24,8 +24,8 @@
     "start": "node -r ./alias-resolver.js dist/ssr/index.js"
   },
   "dependencies": {
-    "@coopenomics/controller": "2025.6.14",
-    "@coopenomics/sdk": "2025.6.14",
+    "@coopenomics/controller": "2025.6.24",
+    "@coopenomics/sdk": "2025.6.24",
     "@dicebear/collection": "^9.0.1",
     "@dicebear/core": "^9.0.1",
     "@fortawesome/fontawesome-svg-core": "^6.5.2",
@@ -50,7 +50,7 @@
     "@wharfkit/wallet-plugin-privatekey": "^1.1.0",
     "axios": "^1.2.1",
     "compression": "^1.7.4",
-    "cooptypes": "2025.6.14",
+    "cooptypes": "2025.6.24",
     "dompurify": "^3.1.7",
     "dotenv": "^16.4.5",
     "email-regex": "^5.0.0",
@@ -80,7 +80,7 @@
   },
   "devDependencies": {
     "@intlify/vite-plugin-vue-i18n": "^3.3.1",
-    "@prettier/plugin-pug": "^3.0.0",
+    "@prettier/plugin-pug": "^3.2.0",
     "@quasar/app-vite": "^1.9.3",
     "@types/node": "^12.20.21",
     "@typescript-eslint/eslint-plugin": "^5.10.0",
@@ -93,7 +93,7 @@
     "eslint-plugin-pug": "^1.2.5",
     "eslint-plugin-vue": "^9.26.0",
     "eslint-plugin-vue-pug": "^0.6.2",
-    "prettier": "^2.8.8",
+    "prettier": "^3.6.0",
     "typescript": "^4.5.4",
     "vite-plugin-checker": "^0.6.4",
     "vue-tsc": "^1.8.22"
@@ -103,5 +103,5 @@
     "npm": ">= 6.13.4",
     "yarn": ">= 1.21.1"
   },
-  "gitHead": "1c376c003ab7d30e5fa11e13152795ac4823885a"
+  "gitHead": "32e6a45f0597e651c2f3ab787462f7aa723c1732"
 }

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

@@ -27,8 +27,7 @@ async function loadPublicBranches(data: IGetBranchesInput): Promise<IPublicBranc
   return output;
 }
 
-
-export const api ={
+export const api = {
   loadBranches,
   loadPublicBranches
 }

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

@@ -1,7 +1,8 @@
-import type { Queries } from '@coopenomics/sdk';
+import type { Queries, Mutations } from '@coopenomics/sdk';
 
 export type IBranch = Queries.Branches.GetBranches.IOutput[typeof Queries.Branches.GetBranches.name][number]
 export type IPublicBranch = Queries.Branches.GetPublicBranches.IOutput[typeof Queries.Branches.GetPublicBranches.name][number]
 
 export type IGetBranchesInput = Queries.Branches.GetBranches.IInput['data']
+export type IDeleteBranchInput = Mutations.Branches.DeleteBranch.IInput['data']
 

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

@@ -77,7 +77,7 @@ export const useSessionStore = defineStore('session', (): ISessionStore => {
         }
       } catch (e: any) {
         console.error(e);
-        FailAlert(e.message);
+        FailAlert(e);
         close()
         globalStore.logout()
       }

package/src/features/Branch/CreateBranch/ui/CreateBranchButton.vue

@@ -1,61 +1,113 @@
 <template lang="pug">
 div
-  q-btn(@click="show = true" color="primary" size="sm" icon="add") добавить участок
-  q-dialog(v-model="show" persistent :maximized="false" )
-    ModalBase(style="width: 500px; max-width: 100% !important;" :title="'Создать кооперативный участок'" :show_close="true")
-      Form(:handler-submit="create" :is-submitting="isSubmitting" :showSubmit="!isLoading" :showCancel="true" :button-submit-txt="'Создать'" @cancel="clear" ).q-pa-md
-        div().q-mb-lg
-          q-input(dense v-model="createBranchInput.trustee" standout="bg-teal text-white" placeholder="" label="Имя аккаунта председателя участка" :rules="[val => notEmpty(val)]" autocomplete="off")
+  q-btn(@click='show = true', color='primary', size='sm', icon='add') добавить участок
+  q-dialog(v-model='show', persistent, :maximized='false')
+    ModalBase(
+      style='width: 500px; max-width: 100% !important',
+      :title='"Создать кооперативный участок"',
+      :show_close='true'
+    )
+      Form.q-pa-md(
+        :handler-submit='create',
+        :is-submitting='isSubmitting',
+        :showSubmit='!isLoading',
+        :showCancel='true',
+        :button-submit-txt='"Создать"',
+        @cancel='clear'
+      )
+        .q-mb-lg
+          UserSearchSelector(
+            v-model='createBranchInput.trustee',
+            label='Председатель участка',
+            :rules='[(val) => notEmpty(val)]',
+            dense,
+            standout='bg-teal text-white'
+          )
 
-          q-input(dense v-model="createBranchInput.short_name" standout="bg-teal text-white" placeholder="РОМАШКА" label="Наименование участка" :rules="[val => notEmpty(val)]" autocomplete="off")
-          q-input(dense v-model="createBranchInput.phone" standout="bg-teal text-white" label="Номер телефона участка"  mask="+7 (###) ###-##-##" fill-mask  placeholder="" :rules="[val => notEmpty(val), val => notEmptyPhone(val)]" autocomplete="off")
-          q-input(dense v-model="createBranchInput.fact_address" standout="bg-teal text-white" placeholder="" label="Фактический адрес участка" :rules="[val => notEmpty(val)]" autocomplete="off")
           q-input(
-            dense v-model='createBranchInput.email',
-            standout="bg-teal text-white",
+            dense,
+            v-model='createBranchInput.short_name',
+            standout='bg-teal text-white',
+            placeholder='РОМАШКА',
+            label='Наименование участка',
+            :rules='[(val) => notEmpty(val)]',
+            autocomplete='off'
+          )
+          q-input(
+            dense,
+            v-model='createBranchInput.phone',
+            standout='bg-teal text-white',
+            label='Номер телефона участка',
+            mask='+7 (###) ###-##-##',
+            fill-mask,
+            placeholder='',
+            :rules='[(val) => notEmpty(val), (val) => notEmptyPhone(val)]',
+            autocomplete='off'
+          )
+          q-input(
+            dense,
+            v-model='createBranchInput.fact_address',
+            standout='bg-teal text-white',
+            placeholder='',
+            label='Фактический адрес участка',
+            :rules='[(val) => notEmpty(val)]',
+            autocomplete='off'
+          )
+          q-input(
+            dense,
+            v-model='createBranchInput.email',
+            standout='bg-teal text-white',
             type='email',
             label='Email-адрес участка',
             color='primary',
             :rules='[validEmail, notEmpty]'
           )
 
-          q-input(dense v-model="createBranchInput.based_on" standout="bg-teal text-white" label="Председатель действует на основании" placeholder="решение собрания совета №СС-10-04-2025 от 10 апреля 2025 г" :rules="[val => notEmpty(val)]" autocomplete="off")
-
-
-
+          q-input(
+            dense,
+            v-model='createBranchInput.based_on',
+            standout='bg-teal text-white',
+            label='Председатель действует на основании',
+            placeholder='решение собрания совета №СС-10-04-2025 от 10 апреля 2025 г',
+            :rules='[(val) => notEmpty(val)]',
+            autocomplete='off'
+          )
 </template>
 
 <script lang="ts" setup>
 import { ModalBase } from 'src/shared/ui/ModalBase';
 import { Form } from 'src/shared/ui/Form';
+import { UserSearchSelector } from 'src/shared/ui';
 import { ref } from 'vue';
 import { useCreateBranch } from '../model';
-import { extractGraphQLErrorMessages, FailAlert, SuccessAlert } from 'src/shared/api';
+import {
+  extractGraphQLErrorMessages,
+  FailAlert,
+  SuccessAlert,
+} from 'src/shared/api';
 import { notEmpty } from 'src/shared/lib/utils';
 import { validEmail } from 'src/shared/lib/utils/validEmailRule';
 import { notEmptyPhone } from 'src/shared/lib/utils';
 
-const show = ref(false)
-const isSubmitting = ref(false)
-const isLoading = ref(false)
-const {createBranchInput, createBranch} = useCreateBranch()
+const show = ref(false);
+const isSubmitting = ref(false);
+const isLoading = ref(false);
+const { createBranchInput, createBranch } = useCreateBranch();
 
 const create = async () => {
   try {
-    isSubmitting.value = true
-    await createBranch(createBranchInput.value)
-    isSubmitting.value = false
-    show.value = false
-    SuccessAlert('Кооперативный участок добавлен')
-  } catch(e){
-    isSubmitting.value = false
-    FailAlert(`Ошибка при создании: ${extractGraphQLErrorMessages(e)}`)
+    isSubmitting.value = true;
+    await createBranch(createBranchInput.value);
+    isSubmitting.value = false;
+    show.value = false;
+    SuccessAlert('Кооперативный участок добавлен');
+  } catch (e) {
+    isSubmitting.value = false;
+    FailAlert(`Ошибка при создании: ${extractGraphQLErrorMessages(e)}`);
   }
-
-}
+};
 
 const clear = () => {
-  show.value = false
-}
-
+  show.value = false;
+};
 </script>

package/src/features/Branch/DeleteBranch/api/index.ts

@@ -0,0 +1,15 @@
+import { client } from 'src/shared/api/client';
+import { Mutations } from '@coopenomics/sdk';
+import type { IDeleteBranchInput } from 'src/entities/Branch/model';
+
+export async function deleteBranch(data: IDeleteBranchInput): Promise<boolean> {
+  const { [Mutations.Branches.DeleteBranch.name]: result } = await client.Mutation(
+    Mutations.Branches.DeleteBranch.mutation,
+    {
+      variables: {
+        data
+      }
+    }
+  );
+  return result;
+}

package/src/features/Branch/DeleteBranch/index.ts

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

package/src/features/Branch/DeleteBranch/model/index.ts

@@ -0,0 +1,44 @@
+import { useBranchStore } from 'src/entities/Branch/model';
+import { useSystemStore } from 'src/entities/System/model';
+import { deleteBranch as apiDeleteBranch } from '../api';
+import { FailAlert, SuccessAlert } from 'src/shared/api';
+import { ref } from 'vue';
+
+export function useDeleteBranch() {
+  const branchStore = useBranchStore();
+  const systemStore = useSystemStore();
+  const loading = ref(false);
+
+  const deleteBranch = async (data: { coopname: string; braname: string; short_name: string }): Promise<boolean> => {
+    try {
+      loading.value = true;
+      const result = await apiDeleteBranch({
+        coopname: data.coopname,
+        braname: data.braname
+      });
+
+      if (result) {
+        SuccessAlert(`Кооперативный участок "${data.short_name}" успешно удален`);
+
+        // После успешного удаления обновляем состояние системы и списка участков
+        await systemStore.loadSystemInfo();
+        await branchStore.loadBranches({
+          coopname: data.coopname
+        });
+
+        return true;
+      }
+      return false;
+    } catch (error: any) {
+      FailAlert(error);
+      return false;
+    } finally {
+      loading.value = false;
+    }
+  };
+
+  return {
+    deleteBranch,
+    loading
+  };
+}

package/src/features/Branch/DeleteBranch/ui/DeleteBranchButton.vue

@@ -0,0 +1,56 @@
+<template lang="pug">
+div
+  q-btn(
+    color="negative"
+    icon="delete"
+    @click="showDialog = true"
+    :loading="loading"
+    :disable="loading"
+  )
+
+    span.q-ml-xs Удалить участок
+
+  q-dialog(v-model="showDialog" @hide="clear")
+    ModalBase(:title='"Удаление кооперативного участка"')
+      Form(
+        :handler-submit="handleDeleteBranch"
+        :is-submitting="loading"
+        :button-cancel-txt="'Отменить'"
+        :button-submit-txt="'Удалить'"
+        @cancel="clear"
+      ).q-pa-md
+        div(style="max-width: 500px;")
+          p.text-weight-bold Вы уверены, что хотите удалить кооперативный участок {{ branch?.short_name }}?
+          p Это действие необратимо. Все пайщики будут отключены от участка и увидят приглашение выбрать новый участок.
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue';
+import type { IBranch } from 'src/entities/Branch/model/types';
+import { ModalBase } from 'src/shared/ui/ModalBase';
+import { Form } from 'src/shared/ui/Form';
+import { useDeleteBranch } from '../model';
+
+const props = defineProps<{
+  branch: IBranch
+}>();
+
+const showDialog = ref(false);
+const { deleteBranch, loading } = useDeleteBranch();
+
+const clear = (): void => {
+  showDialog.value = false;
+};
+
+const handleDeleteBranch = async (): Promise<void> => {
+  const success = await deleteBranch({
+    coopname: props.branch.coopname,
+    braname: props.branch.braname,
+    short_name: props.branch.short_name
+  });
+
+  if (success) {
+    showDialog.value = false;
+  }
+};
+</script>

package/src/features/Cooperative/UpdateBoard/index.ts

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

package/src/features/Cooperative/UpdateBoard/ui/AddMemberDialog.vue

@@ -0,0 +1,59 @@
+<template lang="pug">
+q-dialog(v-model='show', persistent, :maximized='false')
+  q-card
+    div
+      q-bar.bg-gradient-dark
+        span Добавить члена совета
+        q-space
+        q-btn(v-close-popup, dense, flat, icon='close')
+          q-tooltip Close
+
+      .q-pa-sm
+        .q-pa-md
+          p Внимание! Вы собираетесь добавить участника в совет кооператива. Выберите участника для добавления:
+          .q-pa-md
+            UserSearchSelector(
+              v-model='selectedUsername',
+              label='Участник для добавления в совет',
+              dense,
+              standout='bg-teal text-white',
+              :rules='[(val) => !!val || "Обязательное поле"]'
+            )
+        div
+          q-btn(flat, @click='cancel') Отменить
+          q-btn(color='primary', @click='add', :loading='loading') Добавить
+</template>
+
+<script setup lang="ts">
+import { ref, computed } from 'vue';
+import { UserSearchSelector } from 'src/shared/ui';
+
+const props = defineProps<{
+  modelValue: boolean;
+  loading?: boolean;
+}>();
+
+const emit = defineEmits<{
+  (e: 'update:modelValue', value: boolean): void;
+  (e: 'add', username: string): void;
+}>();
+
+const selectedUsername = ref('');
+
+const show = computed({
+  get: () => props.modelValue,
+  set: (value) => emit('update:modelValue', value),
+});
+
+const add = () => {
+  if (selectedUsername.value) {
+    emit('add', selectedUsername.value);
+    selectedUsername.value = '';
+  }
+};
+
+const cancel = () => {
+  emit('update:modelValue', false);
+  selectedUsername.value = '';
+};
+</script>

package/src/features/Cooperative/UpdateBoard/ui/index.ts

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

package/src/features/Installer/ui/RequestKeyForm/RequestKeyForm.vue

@@ -52,7 +52,7 @@ form(@submit.prevent="submit").full-width
 
     } catch (e: any) {
       loading.value = false
-      FailAlert(e.message)
+      FailAlert(e)
     }
 
   }

package/src/features/Installer/ui/SetSovietForm/SetSovietForm.vue

@@ -59,7 +59,7 @@ const next = async () => {
 
     SuccessAlert('Установка произведена успешно')
   } catch(e: any){
-    FailAlert(e.message)
+    FailAlert(e)
     loading.value = false
   }
 

package/src/features/Meet/CreateMeet/model/index.ts

@@ -18,6 +18,7 @@ export interface ICreateMeetWithAgendaInput {
   open_at: string
   close_at: string
   username: string
+  type: 'regular' | 'extra'
   agenda_points: {
     title: string
     context: string
@@ -81,11 +82,12 @@ export async function createMeetWithAgenda(data: ICreateMeetWithAgendaInput): Pr
     coopname: data.coopname,
     username: data.username,
     meet: {
-      type: 'regular', // По умолчанию очередное собрание
+      type: data.type,
       open_at_datetime: openAtFormatted,
       close_at_datetime: closeAtFormatted
     },
-    questions: questions
+    questions: questions,
+    is_repeated: false
   })
 
 

package/src/features/Meet/CreateMeet/ui/CreateMeet.vue

@@ -5,9 +5,11 @@ div
     label="Создать общее собрание"
     @click="showCreateMeetDialog = true"
   )
+
   CreateMeetForm(
     v-model="showCreateMeetDialog"
     :loading="isCreating"
+    :is-chairman="isChairman"
     @create="handleCreate"
   )
 </template>
@@ -22,6 +24,11 @@ import { useRoute } from 'vue-router'
 import { Notify } from 'quasar'
 import { FailAlert } from 'src/shared/api'
 
+// Определяем пропсы
+defineProps<{
+  isChairman: boolean
+}>()
+
 const route = useRoute()
 const sessionStore = useSessionStore()
 const meetStore = useMeetStore()
@@ -40,6 +47,7 @@ const handleCreate = async (formData: any) => {
       open_at: formData.open_at,
       close_at: formData.close_at,
       username: sessionStore.username,
+      type: formData.type,
       agenda_points: formData.agenda_points
     })