@coopenomics/desktop 2.2.5 → 2.2.6

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.2.6](https://github.com/coopenomics/monocoop/compare/v2.2.6-alpha.0...v2.2.6) (2025-01-27)
+
+**Note:** Version bump only for package @coopenomics/desktop
+
+
+
+
+
 ## [2.2.5](https://github.com/coopenomics/monocoop/compare/v2.2.4...v2.2.5) (2025-01-18)
 
 **Note:** Version bump only for package @coopenomics/desktop

package/extensions/powerup/boot.ts

@@ -13,5 +13,5 @@ export default boot(({ app, router }: { app: App<Element>; router: Router }) =>
   //   component: () => import('./MyExtensionPage.vue')
   // })
 
-  console.log('Расширение загружено успешно')
+  console.log('Расширение powerup загружено успешно')
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coopenomics/desktop",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "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.5",
-    "@coopenomics/sdk": "2.2.5",
+    "@coopenomics/controller": "2.2.6",
+    "@coopenomics/sdk": "2.2.6",
     "@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.5",
+    "cooptypes": "2.2.6",
     "dompurify": "^3.1.7",
     "dotenv": "^16.4.5",
     "email-regex": "^5.0.0",
@@ -76,7 +76,7 @@
     "@types/node": "^12.20.21",
     "@typescript-eslint/eslint-plugin": "^5.10.0",
     "@typescript-eslint/parser": "^5.10.0",
-    "@vue/language-plugin-pug": "^1.0.0",
+    "@vue/language-plugin-pug": "^1.8.27",
     "autoprefixer": "^10.4.2",
     "concurrently": "^8.2.2",
     "eslint": "^8.57.0",
@@ -94,5 +94,5 @@
     "npm": ">= 6.13.4",
     "yarn": ">= 1.21.1"
   },
-  "gitHead": "97b21a9d69b6c387a1a7f2c32642d29c0898694e"
+  "gitHead": "d0bd4428bebd6971c23c27d8d26643d72e3f07cb"
 }

package/src/app/App.vue

@@ -12,9 +12,11 @@ import { useRoute } from 'vue-router'
 import 'src/app/styles/quasar-variables.sass'
 import { useDesktopStore } from 'src/entities/Desktop/model';
 import { Cookies, LocalStorage, QSpinnerGears, useQuasar } from 'quasar';
-import { COOPNAME } from 'src/shared/config';
+
 import { RequireAgreements } from 'src/widgets/Agreementer/RequireAgreements/ui';
 import { SelectBranchOverlay } from 'src/features/Branch/SelectBranch';
+import { useSystemStore } from 'src/entities/System/model';
+const { info } = useSystemStore()
 
 const $q = useQuasar()
 
@@ -56,7 +58,7 @@ onMounted(async () => {
     const ref = Cookies.get('referer') || String(route.query.r || '')
 
     if (ref) {
-      LocalStorage.setItem(`${COOPNAME}:referer`, ref)
+      LocalStorage.setItem(`${info.coopname}:referer`, ref)
     }
   } catch (e: unknown) {
 

package/src/app/providers/card/store.ts

@@ -2,7 +2,8 @@ import { defineStore } from 'pinia'
 import { useSessionStore } from 'src/entities/Session';
 import { useCurrentUserStore } from 'src/entities/User';
 import { useWalletStore } from 'src/entities/Wallet';
-import { COOPNAME } from 'src/shared/config';
+
+import { useSystemStore } from 'src/entities/System/model';
 
 const namespace = 'cardstore'
 
@@ -18,12 +19,14 @@ export const useCardStore = defineStore(namespace, (): ICardStore => {
   const session = useSessionStore();
 
   async function initWallet(): Promise<void> {
+      const { info } = useSystemStore()
+
     // if (!session.isAuth && !currentUser.userAccount){
       await session.init()
       if (session.isAuth)
         try{
-          await currentUser.loadProfile(session.username, COOPNAME)
-          await userWallet.loadUserWalet({coopname: COOPNAME, username: session.username})
+          await currentUser.loadProfile(session.username, info.coopname)
+          await userWallet.loadUserWalet({coopname: info.coopname, username: session.username})
           session.loadComplete = true
 
         } catch(e: any){

package/src/boot/branch-selector.ts

@@ -20,9 +20,7 @@ export default async () => {
       account.account.participant_account.braname === ''//у пользователя нет установленного кооперативного участка
     ) {
       isVisible.value = true;
-      console.log('on select branch', isVisible);
     } else {
-      console.log('not need select branch');
       isVisible.value = false;
     }
   };

package/src/boot/navigation-guards.ts

@@ -1,9 +1,9 @@
 // src/boot/navigation-guards.js
 import { boot } from 'quasar/wrappers';
-import { COOPNAME } from 'src/shared/config';
 import { useSessionStore } from 'src/entities/Session';
 import { useCurrentUserStore } from 'src/entities/User';
 import { useDesktopStore } from 'src/entities/Desktop/model';
+import { useSystemStore } from 'src/entities/System/model';
 
 // Function to handle access logic
 function hasAccess(to, userAccount) {
@@ -17,13 +17,13 @@ export default boot(async ({ router }) => {
   const desktops = useDesktopStore();
   const session = useSessionStore();
   const currentUser = useCurrentUserStore();
+  const { info } = useSystemStore()
 
   router.beforeEach(async (to, from, next) => {
     await desktops.healthCheck();
-    console.log('to', to)
+
     if (desktops.health?.status === 'install' && to.name !== 'install') {
-      console.log(1)
-      next({ name: 'install', params: { coopname: COOPNAME } });
+      next({ name: 'install', params: { coopname: info.coopname } });
       return;
     }
 
@@ -33,9 +33,7 @@ export default boot(async ({ router }) => {
           ? desktops.currentDesktop?.authorizedHome
           : desktops.currentDesktop?.nonAuthorizedHome;
 
-      console.log('homePage: ', homePage)
-      // next();
-      next({ name: homePage, params: { coopname: COOPNAME } });
+      next({ name: homePage, params: { coopname: info.coopname } });
       return;
     }
 

package/src/components/menu/footerMobileMenu.vue

@@ -28,7 +28,9 @@ import { useRouter } from 'vue-router'
 import { useQuasar } from 'quasar'
 import { useMenuStore } from 'src/entities/Menu'
 import type { IMenu } from 'src/entities/Menu'
-import { COOPNAME } from 'src/shared/config'
+import { useSystemStore } from 'src/entities/System/model';
+const { info } = useSystemStore()
+
 import { useCurrentUserStore } from 'src/entities/User'
 const emit = defineEmits(['toogleMore'])
 const $q = useQuasar()
@@ -47,7 +49,7 @@ const headerClass = (route: IMenu) => {
 }
 
 const open = (route: IMenu) => {
-  router.push({ name: route.name, params: { coopname: COOPNAME } })
+  router.push({ name: route.name, params: { coopname: info.coopname } })
 }
 </script>
 

package/src/components/soviet/staff.vue

@@ -106,7 +106,9 @@ const username = computed(() => session.username)
 const showAdd = ref(false);
 import moment from 'moment-with-locales-es6'
 import { useAddAdmin } from 'src/features/Cooperative/AddAdmin';
-import { COOPNAME } from 'src/shared/config';
+import { useSystemStore } from 'src/entities/System/model';
+const { info } = useSystemStore()
+
 import { useCooperativeStore } from 'src/entities/Cooperative';
 import { useSetRights } from 'src/features/Cooperative/SetRights';
 const cooperativeStore = useCooperativeStore()
@@ -115,7 +117,7 @@ const staff = computed(() => cooperativeStore.admins)
 const loadStaff = async () => {
 
   try {
-    await cooperativeStore.loadAdmins(COOPNAME)
+    await cooperativeStore.loadAdmins(info.coopname)
   } catch (e: any) {
 
     Notify.create({
@@ -157,14 +159,14 @@ const rmRight = (rightIndex: number, username: string) => {
 const addStaff = async () => {
   try {
     useAddAdmin().addAdmin({
-      coopname: COOPNAME,
+      coopname: info.coopname,
       chairman: username.value,
       username: newPersona.value.username,
       rights: [],
       position_title: newPersona.value.position_title,
     })
 
-    cooperativeStore.loadAdmins(COOPNAME)
+    cooperativeStore.loadAdmins(info.coopname)
 
     newPersona.value = {
       username: '',
@@ -193,12 +195,12 @@ const addStaff = async () => {
 // const rmStaff = async (username) => {
 //   try {
       // await useDeleteAdmin().deleteAdmin({
-      //   coopname: COOPNAME,
+      //   coopname: info.coopname,
       //   chairman: session.username,
       //   username
       // })
 
-    // cooperativeStore.loadAdmins(COOPNAME)
+    // cooperativeStore.loadAdmins(info.coopname)
 
 //     Notify.create({
 //       message: 'Администратор уволен',
@@ -227,7 +229,7 @@ const setRights = async (newUsername: string) => {
     const user = staff.value.find(u => u.username === newUsername);
 
     await useSetRights().setRights({
-      coopname: COOPNAME,
+      coopname: info.coopname,
       chairman: username.value,
       username: newUsername,
       rights: user?.rights as { contract: string; action_name: string; }[]

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

@@ -8,6 +8,13 @@ import { agreementsBase } from 'src/shared/lib/consts/workspaces';
 import { ConnectionPage } from 'src/pages/Union/Connection';
 import { ListOfDocumentsPage } from 'src/pages/Documentor/ListOfDocuments';
 import { CoopCardPage } from 'src/pages/User/CardPage';
+import { MainMarketplacePage } from 'src/pages/Marketplace/MainPage';
+import { ModerationPage } from 'src/pages/Marketplace/Moderation';
+import { CreateParentOfferPage } from 'src/pages/Marketplace/CreateParentOffer';
+import { ShowcasePage } from 'src/pages/Marketplace/Showcase';
+import { UserParentOffersPage } from 'src/pages/Marketplace/UserParentOffers';
+import { UserSuppliesListPage } from 'src/pages/Marketplace/UserSuppliesList';
+import { SuppliesListPage } from 'src/pages/Marketplace/SuppliesList';
 
 export const manifest = {
   'name': 'UserDesktop',
@@ -163,7 +170,92 @@ export const manifest = {
             roles: [],
           },
         },
-
+        // {
+          // meta: {
+            // title: 'Маркетплейс',
+            // icon: 'fa-solid fa-cog',
+            // roles: [],
+          // },
+        //   path: '/:coopname/marketplace',
+        //   name: 'marketplace',
+        //   component: markRaw(MainMarketplacePage),
+        //   children: [
+        //     {
+        //       path: 'moderation',
+        //       name: 'marketplace-moderation',
+        //       component: markRaw(ModerationPage),
+        //       meta: {
+        //         title: 'Модерация',
+        //         icon: '',
+        //         roles: ['member', 'chairman'],
+        //       },
+        //     },
+        //     {
+        //       path: 'create-offer',
+        //       name: 'marketplace-create-offer',
+        //       component: markRaw(CreateParentOfferPage),
+        //       meta: {
+        //         title: 'Создать объявление',
+        //         icon: '',
+        //         roles: [],
+        //       },
+        //     },
+        //     {
+        //       path: 'showcase',
+        //       name: 'marketplace-showcase',
+        //       component: markRaw(ShowcasePage),
+        //       children: [
+        //         {
+        //           path: ':id',
+        //           name: 'marketplace-showcase-id',
+        //           component: markRaw(ShowcasePage),
+        //         },
+        //       ],
+        //       meta: {
+        //         title: 'Витрина',
+        //         icon: '',
+        //         roles: [],
+        //       },
+        //     },
+        //     {
+        //       path: 'user-offers',
+        //       name: 'marketplace-user-offers',
+        //       component: markRaw(UserParentOffersPage),
+        //       children: [
+        //         {
+        //           path: ':id',
+        //           name: 'marketplace-user-offer-id',
+        //           component: markRaw(UserParentOffersPage),
+        //         },
+        //       ],
+        //       meta: {
+        //         title: 'Мои объявления',
+        //         icon: '',
+        //         roles: [],
+        //       },
+        //     },
+        //     {
+        //       path: 'supplies',
+        //       name: 'marketplace-supplies',
+        //       component: markRaw(SuppliesListPage),
+        //       meta: {
+        //         title: 'Все заказы',
+        //         icon: '',
+        //         roles: ['member', 'chairman'],
+        //       },
+        //     },
+        //     {
+        //       path: 'user-supplies',
+        //       name: 'marketplace-user-supplies',
+        //       component: markRaw(UserSuppliesListPage),
+        //       meta: {
+        //         title: 'Мои заказы',
+        //         icon: '',
+        //         roles: [],
+        //       },
+        //     },
+        //   ],
+        // },
         // {
         //   meta: {
         //     title: 'Поддержка',
@@ -207,92 +299,7 @@ export const manifest = {
 
 
 
-      // {
-      //   meta: {
-      //     title: 'Маркетплейс',
-      //     icon: 'fa-solid fa-cog',
-      //     roles: [],
-      //   },
-      //   path: '/:coopname/marketplace',
-      //   name: 'marketplace',
-      //   component: markRaw(MainMarketplacePage),
-      //   children: [
-      //     {
-      //       path: 'moderation',
-      //       name: 'marketplace-moderation',
-      //       component: markRaw(ModerationPage),
-      //       meta: {
-      //         title: 'Модерация',
-      //         icon: '',
-      //         roles: ['member', 'chairman'],
-      //       },
-      //     },
-      //     {
-      //       path: 'create-offer',
-      //       name: 'marketplace-create-offer',
-      //       component: markRaw(CreateParentOfferPage),
-      //       meta: {
-      //         title: 'Создать объявление',
-      //         icon: '',
-      //         roles: [],
-      //       },
-      //     },
-      //     {
-      //       path: 'showcase',
-      //       name: 'marketplace-showcase',
-      //       component: markRaw(ShowcasePage),
-      //       children: [
-      //         {
-      //           path: ':id',
-      //           name: 'marketplace-showcase-id',
-      //           component: markRaw(ShowcasePage),
-      //         },
-      //       ],
-      //       meta: {
-      //         title: 'Витрина',
-      //         icon: '',
-      //         roles: [],
-      //       },
-      //     },
-      //     {
-      //       path: 'user-offers',
-      //       name: 'marketplace-user-offers',
-      //       component: markRaw(UserParentOffersPage),
-      //       children: [
-      //         {
-      //           path: ':id',
-      //           name: 'marketplace-user-offer-id',
-      //           component: markRaw(UserParentOffersPage),
-      //         },
-      //       ],
-      //       meta: {
-      //         title: 'Мои объявления',
-      //         icon: '',
-      //         roles: [],
-      //       },
-      //     },
-      //     {
-      //       path: 'supplies',
-      //       name: 'marketplace-supplies',
-      //       component: markRaw(SuppliesListPage),
-      //       meta: {
-      //         title: 'Все заказы',
-      //         icon: '',
-      //         roles: ['member', 'chairman'],
-      //       },
-      //     },
-      //     {
-      //       path: 'user-supplies',
-      //       name: 'marketplace-user-supplies',
-      //       component: markRaw(UserSuppliesListPage),
-      //       meta: {
-      //         title: 'Мои заказы',
-      //         icon: '',
-      //         roles: [],
-      //       },
-      //     },
-      //   ],
-      // },
+
       //страница контактов
       // {
       //   path: ':coopname/contacts',

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

@@ -1,9 +1,8 @@
+import { MarketContract } from 'cooptypes';
 import { fetchTable } from '../../../shared/api';
 import {
-  ContractsList,
   LimitsList,
   SecondaryIndexesNumbers,
-  TablesList,
 } from '../../../shared/config';
 import { ILoadAllRequests, IUpdateOneRequest } from '../model';
 import type {
@@ -27,9 +26,9 @@ async function loadAllRequests(
   params: ILoadAllRequests
 ): Promise<IRequestData[]> {
   const requests = (await fetchTable(
-    ContractsList.Marketplace,
+    MarketContract.contractName.production,
     params.coopname,
-    TablesList.CoopMarketRequests
+    MarketContract.Tables.Requests.tableName,
   )) as any[];
 
   requests.map((el) => (el.data = parseRequestObjectData(el.data)));
@@ -42,9 +41,9 @@ async function loadOneRequest(
 ): Promise<IRequestData> {
   const request = (
     await fetchTable(
-      ContractsList.Marketplace,
+      MarketContract.contractName.production,
       params.coopname,
-      TablesList.CoopMarketRequests,
+      MarketContract.Tables.Requests.tableName,
       params.request_id,
       params.request_id,
       1
@@ -55,9 +54,9 @@ async function loadOneRequest(
   if (request.parent_id !== 0) {
     const parent_request = (
       (await fetchTable(
-        ContractsList.Marketplace,
+        MarketContract.contractName.production,
         params.coopname,
-        TablesList.CoopMarketRequests,
+        MarketContract.Tables.Requests.tableName,
         request.parent_id,
         request.parent_id,
         1
@@ -74,16 +73,17 @@ async function loadOneRequest(
 async function loadAllParentOffers(
   params: ILoadAllParentOffers
 ): Promise<IRequestData[]> {
+  console.log(params)
   const requests = (await fetchTable(
-    ContractsList.Marketplace,
+    MarketContract.contractName.production,
     params.coopname,
-    TablesList.CoopMarketRequests,
+    MarketContract.Tables.Requests.tableName,
     0,
     0,
     LimitsList.None,
     SecondaryIndexesNumbers.Six
   )) as any[];
-
+  console.log('loaded:', requests)
   requests.map((el) => (el.data = parseRequestObjectData(el.data)));
 
   return requests as IRequestData[];
@@ -94,9 +94,9 @@ async function loadAllChildOrders(
 ): Promise<IRequestData[]> {
   const child_requests = (
     (await fetchTable(
-      ContractsList.Marketplace,
+      MarketContract.contractName.production,
       params.coopname,
-      TablesList.CoopMarketRequests,
+      MarketContract.Tables.Requests.tableName,
       1,
       -1,
       LimitsList.None,
@@ -119,9 +119,9 @@ async function loadUserParentOffers(
 ): Promise<IRequestData[]> {
   const requests = (
     (await fetchTable(
-      ContractsList.Marketplace,
+      MarketContract.contractName.production,
       params.coopname,
-      TablesList.CoopMarketRequests,
+      MarketContract.Tables.Requests.tableName,
       params.username,
       params.username,
       LimitsList.None,
@@ -142,9 +142,9 @@ async function loadUserChildOrders(
   //  получаем встречные заявки, в которых пользователь - родитель
   const user_incoming_requests = (
     (await fetchTable(
-      ContractsList.Marketplace,
+      MarketContract.contractName.production,
       params.coopname,
-      TablesList.CoopMarketRequests,
+      MarketContract.Tables.Requests.tableName,
       params.username,
       params.username,
       LimitsList.None,
@@ -158,9 +158,9 @@ async function loadUserChildOrders(
   //получаем исходящие заявки пользователя
   const user_outcoming_requests = (
     (await fetchTable(
-      ContractsList.Marketplace,
+      MarketContract.contractName.production,
       params.coopname,
-      TablesList.CoopMarketRequests,
+      MarketContract.Tables.Requests.tableName,
       params.username,
       params.username,
       LimitsList.None,

package/src/entities/Request/model/stores.ts

@@ -81,6 +81,7 @@ export const useRequestStore = defineStore(namespace, (): IRequestsStore => {
     allParentOffers.value = (await api.loadAllParentOffers(params)).sort(
       (a, b) => Number(b.id) - Number(a.id)
     )
+    console.log('on load', params, allParentOffers.value)
   }
 
   const loadAllChildOrders = async (params: ILoadAllChildOrders): Promise<void> => {

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

@@ -32,6 +32,7 @@ export class UserEntity {
       username,
       coopname
     );
+
   }
 
   async loadPrivateProfile(username: string): Promise<void> {

package/src/features/Agreementer/GenerateAgreement/ui/AgreementReader.vue

@@ -4,7 +4,9 @@ div(v-if="agreement")
 </template>
 
 <script setup lang="ts">
-  import { COOPNAME } from 'src/shared/config';
+  import { useSystemStore } from 'src/entities/System/model';
+  const { info } = useSystemStore()
+
   import { useGenerateAgreement } from '../model';
   import { useSessionStore } from 'src/entities/Session';
   import { computed, onMounted } from 'vue';
@@ -28,7 +30,7 @@ div(v-if="agreement")
 
   onMounted(async () => {
     try {
-      await generateAgreement(COOPNAME, session.username, Number(props.agreement.draft_id));
+      await generateAgreement(info.coopname, session.username, Number(props.agreement.draft_id));
     } catch(e: any){
       FailAlert(`Возникла ошибка при генерации соглашения, пожалуйста, обратитесь в поддержку с сообщением: ${e.message}`);
     }

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

@@ -1,8 +1,9 @@
 import { DigitalDocument, type IGeneratedDocument } from 'src/shared/lib/document';
 import { api } from '../api';
-import { COOPNAME } from 'src/shared/config';
+import { useSystemStore } from 'src/entities/System/model';
 
 export const useSignAgreement = () => {
+  const { info } = useSystemStore()
 
   const signAgreement = async(username: string, agreement_type: string, agreement: IGeneratedDocument) => {
     const document = new DigitalDocument(agreement);
@@ -13,8 +14,8 @@ export const useSignAgreement = () => {
 
 
     await api.sendAgreement({
-      coopname: COOPNAME,
-      administrator: COOPNAME,
+      coopname: info.coopname,
+      administrator: info.coopname,
       username,
       agreement_type,
       document: {...document.signedDocument, meta: JSON.stringify(document.signedDocument.meta)}

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

@@ -17,7 +17,9 @@ import { SovietContract } from 'cooptypes';
 import { FailAlert, SuccessAlert } from 'src/shared/api';
 import { useSignAgreement } from '../model';
 import { useWalletStore } from 'src/entities/Wallet';
-import { COOPNAME } from 'src/shared/config';
+import { useSystemStore } from 'src/entities/System/model';
+const { info } = useSystemStore()
+
 import { useSessionStore } from 'src/entities/Session';
 import { Loader } from 'src/shared/ui/Loader';
 
@@ -54,7 +56,7 @@ const sign = async () => {
   try {
     isSubmitting.value = true
     await signAgreement(session.username, props.agreement.type, agreementOnSign.value)
-    await useWalletStore().loadUserWalet({coopname: COOPNAME, username: session.username})
+    await useWalletStore().loadUserWalet({coopname: info.coopname, username: session.username})
     isSubmitting.value = false
     show.value = false
     SuccessAlert('Документ принят')