@coopenomics/desktop 2.2.10 → 2025.4.29

package/src/app/layouts/useDefaultLayoutLogic.ts

@@ -0,0 +1,59 @@
+import { computed, ref, onMounted, watch } from 'vue'
+import { useQuasar } from 'quasar'
+import { useRoute } from 'vue-router'
+import { useWindowSize } from 'vue-window-size'
+import { useSystemStore } from 'src/entities/System/model'
+import { useSessionStore } from 'src/entities/Session'
+import { useCurrentUserStore } from 'src/entities/User'
+import { useCooperativeStore } from 'src/entities/Cooperative'
+
+export function useDefaultLayoutLogic() {
+  const $q = useQuasar()
+  const { width } = useWindowSize()
+  const route = useRoute()
+  const session = useSessionStore()
+  const currentUser = useCurrentUserStore()
+  const cooperativeStore = useCooperativeStore()
+  const system = useSystemStore()
+
+  cooperativeStore.loadContacts()
+
+  const leftDrawerOpen = ref(true)
+  const isMobile = computed(() => width.value < 768)
+  const isDark = computed(() => $q.dark.isActive)
+  const headerClass = computed(() => isDark.value ? 'text-white bg-dark' : 'text-black bg-light')
+  const loggedIn = computed(() => currentUser.isRegistrationComplete && session.isAuth)
+  const showDrawer = computed(() => route.params.coopname === system.info.coopname)
+
+  const footerText = computed(() => {
+    const c = cooperativeStore.contacts
+    const d = c?.details
+    return d
+      ? `${c.full_name}, ИНН: ${d.inn}, ОГРН: ${d.ogrn}, телефон: ${c.phone}, почта: ${c.email}`
+      : ''
+  })
+
+  onMounted(() => {
+    if (isMobile.value || !loggedIn.value) {
+      leftDrawerOpen.value = false
+    }
+  })
+
+  watch(loggedIn, (v) => {
+    leftDrawerOpen.value = v
+  })
+
+  const toggleLeftDrawer = () => {
+    leftDrawerOpen.value = !leftDrawerOpen.value
+  }
+
+  return {
+    leftDrawerOpen,
+    isMobile,
+    loggedIn,
+    showDrawer,
+    headerClass,
+    footerText,
+    toggleLeftDrawer,
+  }
+}

package/src/app/providers/routes/index.ts

@@ -1,25 +1,23 @@
-import layout from 'src/pages/_layouts/default.vue';
+import layout from 'src/app/layouts/default.vue';
 import index from 'src/pages/index.vue';
-import blank from 'src/pages/blank/blank.vue';
-import permissionDenied from 'src/pages/_layouts/permissionDenied.vue';
+import { BlankPage } from 'src/pages/Blank';
+import { PermissionDenied } from 'src/pages/PermissionDenied';
 import { SignUpPage } from 'src/pages/Registrator/SignUp';
 import { SignInPage } from 'src/pages/Registrator/SignIn';
 import { RouteRecordRaw } from 'vue-router';
-import { InstallCooperativePage } from 'src/pages/Installer';
+import { InstallCooperativePage } from 'src/pages/Union/InstallCooperative';
 import { LostKeyPage } from 'src/pages/Registrator/LostKey/ui';
 import { ResetKeyPage } from 'src/pages/Registrator/ResetKey';
-import { UserSettingsPage } from 'src/pages/User/SettingsPage';
 import CooperativeSettingsPage from 'src/pages/Cooperative/SettingsPage/CooperativeSettingsPage.vue';
-import { UserPaymentMethodsPage } from 'src/pages/User/PaymentMethodsPage';
 import { AccumulationFunds, ExpenseFunds } from 'src/widgets/Cooperative/Funds';
-import { ChangeCooperativeContributions } from 'src/widgets/Cooperative/Contributions';
-import { ChangeCooperativeContacts } from 'src/widgets/Cooperative/Contacts';
+import { ChangeRegisterPaymentsPage } from 'src/pages/Cooperative/ChangeRegisterPayments';
+import { ChangeCooperativeContacts } from 'src/pages/Cooperative/ChangeContacts';
 import { MembersPage } from 'src/pages/Cooperative/MembersPage';
-import { InstalledExtensions } from 'src/pages/ExtStore/InstalledExtensions';
-import { ExtensionsShowcase } from 'src/pages/ExtStore/ExtensionsShowcase';
-import { ExtensionStoreBase } from 'src/pages/ExtStore/BaseRoute';
-import { ExtensionPage } from 'src/pages/ExtStore/ExtensionPage';
-import { ListOfBranchesPage } from 'src/pages/Cooperative/ListOfBranches';
+import { InstalledExtensions } from 'src/pages/ExtensionStore/InstalledExtensions';
+import { ExtensionsShowcase } from 'src/pages/ExtensionStore/ExtensionsShowcase';
+import { ExtensionPage } from 'src/pages/ExtensionStore/ExtensionPage';
+import { MemberBranchList } from 'src/pages/Cooperative/MemberBranchList';
+import { ExtensionStoreBase } from 'src/pages/ExtensionStore/BaseRoute';
 
 
 const baseRoutes = [
@@ -36,12 +34,12 @@ const baseRoutes = [
       {
         path: '/something-bad',
         name: 'somethingBad',
-        component: blank,
+        component: BlankPage,
       },
       {
         path: '/permission-denied',
         name: 'permissionDenied',
-        component: permissionDenied,
+        component: PermissionDenied,
       },
       {
         path: ':coopname/install',
@@ -73,19 +71,6 @@ const baseRoutes = [
         component: SignUpPage,
         children: [],
       },
-      {
-        path: 'settings/user',
-        name: 'user-settings',
-        component: UserSettingsPage,
-        children: [
-          {
-            path: 'payment-methods',
-            name: 'user-payment-methods',
-            component: UserPaymentMethodsPage,
-            children: [],
-          },
-        ],
-      },
       {
         path: 'settings/cooperative',
         name: 'cooperative-settings',
@@ -100,7 +85,7 @@ const baseRoutes = [
           {
             path: 'branches',
             name: 'branches',
-            component: ListOfBranchesPage,
+            component: MemberBranchList,
             children: [],
           },
           {
@@ -118,7 +103,7 @@ const baseRoutes = [
           {
             path: 'initial-contributions',
             name: 'initial-contributions',
-            component: ChangeCooperativeContributions,
+            component: ChangeRegisterPaymentsPage,
             children: [],
           },
           {
@@ -174,7 +159,7 @@ const baseRoutes = [
       {
         path: '/:pathMatch(.*)*',
         name: 'NotFound',
-        component: blank,
+        component: BlankPage,
       },
     ],
   },
@@ -267,17 +252,17 @@ const baseRoutes = [
 //       {
 //         path: '/something-bad',
 //         name: 'somethingBad',
-//         component: blank,
+//         component: BlankPage,
 //       },
 //       {
 //         path: '/permission-denied',
 //         name: 'permissionDenied',
-//         component: permissionDenied,
+//         component: PermissionDenied,
 //       },
 //       {
 //         path: '/:pathMatch(.*)*',
 //         name: 'NotFound',
-//         component: blank,
+//         component: BlankPage,
 //       },
 //     ],
 //   },

package/src/app/styles/style.css

@@ -4,6 +4,7 @@
 @tailwind components;
 @tailwind utilities;
 
+
 /* Стили для полосы прокрутки содержимого drawer */
 .q-drawer__content::-webkit-scrollbar {
   width: 0px;
@@ -57,6 +58,9 @@
 .selected {
   border: 0.1px solid grey;
 }
+.no-padding {
+  padding: 0px !important;
+}
 
 .no-select {
   -webkit-touch-callout: none; /* iOS Safari */

package/src/boot/init.ts

@@ -0,0 +1,6 @@
+import { boot } from 'quasar/wrappers'
+import { useInitAppProcess } from 'src/processes/init-app'
+
+export default boot(async ({ router }) => {
+  await useInitAppProcess(router)
+})

package/src/boot/sentry.ts

@@ -1,14 +1,13 @@
 import { boot } from 'quasar/wrappers';
 import { App } from 'vue';
 import { Router } from 'vue-router';
-import { NODE_ENV } from 'src/shared/config';
 import Tracker from '@openreplay/tracker';
 import trackerAssist from '@openreplay/tracker-assist'
 import { useSessionStore } from 'src/entities/Session';
 export default boot(
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   ({ app, router }: { app: App<Element>; router: Router }) => {
-    if ((NODE_ENV as string) === 'production') {
+    if ((process.env.NODE_ENV as string) === 'production') {
       const session = useSessionStore()
 
       const tracker = new Tracker({

package/src/desktops/index.ts

@@ -1,9 +1,3 @@
 export * from './Chairman'
 export * from './Member'
-export * from './User'
 export * from './Setup'
-
-// export desktopsMap {
-//   Chairman: ChairmanDesktop,
-
-// }

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

@@ -1 +1 @@
-export * from './store'
+export * from './store'

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

@@ -0,0 +1,20 @@
+import { client } from 'src/shared/api/client';
+import { Queries } from '@coopenomics/sdk';
+import type { IAgenda, IGetAgendaInput } from '../model';
+
+async function loadAgenda(data: IGetAgendaInput): Promise<IAgenda[]> {
+  const { [Queries.Agenda.GetAgenda.name]: output } = await client.Query(
+    Queries.Agenda.GetAgenda.query,
+    {
+      variables: {
+        data
+      }
+    }
+  );
+  
+  return output;
+}
+
+export const api = {
+  loadAgenda
+} 

package/src/entities/Agenda/index.ts

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

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

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

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

@@ -0,0 +1,36 @@
+import { defineStore } from 'pinia'
+import { ref, Ref } from 'vue'
+import { api } from '../api'
+import type { IAgenda, IGetAgendaInput } from './types';
+
+const namespace = 'agendaStore';
+
+interface IAgendaStore {
+  agenda: Ref<IAgenda[]>
+  loading: Ref<boolean>
+  loadAgenda: (data: IGetAgendaInput, hidden?: boolean) => Promise<IAgenda[]>;
+}
+
+export const useAgendaStore = defineStore(namespace, (): IAgendaStore => {
+  const agenda = ref<IAgenda[]>([])
+  const loading = ref(false)
+
+  const loadAgenda = async (data: IGetAgendaInput, hidden = false): Promise<IAgenda[]> => {
+    try {
+      loading.value = hidden ? false : true
+      const loadedData = await api.loadAgenda(data);
+      agenda.value = loadedData;
+      loading.value = false
+      return loadedData;
+    } catch (error) {
+      loading.value = false
+      throw error;
+    }
+  };
+
+  return {
+    agenda,
+    loading,
+    loadAgenda
+  }
+}) 

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

@@ -0,0 +1,4 @@
+import type { Queries } from '@coopenomics/sdk';
+
+export type IAgenda = Queries.Agenda.GetAgenda.IOutput[typeof Queries.Agenda.GetAgenda.name][number]
+export type IGetAgendaInput = Queries.Agenda.GetAgenda.IInput

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

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

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

@@ -1,10 +1,25 @@
 import type { IHealthResponse } from '@coopenomics/controller';
+import { Queries } from '@coopenomics/sdk';
 import { sendGET } from 'src/shared/api';
+import type { IDesktop } from '../model/types';
+import { client } from 'src/shared/api/client';
 
 async function healthCheck(): Promise<IHealthResponse> {
   return (await sendGET('/v1/system/health', {}, true)) as IHealthResponse;
 }
 
+async function getDesktop(): Promise<IDesktop> {
+  const { [Queries.Desktop.GetDesktop.name]: output } = await client.Query(Queries.Desktop.GetDesktop.query, {
+    variables: {
+      data: {}
+    }
+  });
+
+  return output;
+}
+
+
 export const api ={
-  healthCheck
+  healthCheck,
+  getDesktop
 }

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

@@ -1,135 +1,141 @@
 import { defineStore } from 'pinia'
-import * as Desktops from 'src/desktops'
-import { computed, ComputedRef, ref, Ref } from 'vue'
-import { FailAlert } from 'src/shared/api'
-import { RouteRecordRaw, type RouteLocationNormalized} from 'vue-router'
-import { IDesktop, IRoute, IBlockchainDesktops, IHealthResponse } from './types'
+import { computed, ref } from 'vue'
+import { RouteRecordRaw, type RouteMeta, type Router } from 'vue-router'
+import type { IHealthResponse, IBackNavigationButton, IDesktopWithNavigation } from './types'
 import { api } from '../api'
 
-const desktopHashMap = {
-  'hash1': Desktops.UserDesktopModel.manifest, //User
-  'hash2': Desktops.ChairmanDesktopModel.manifest, //'Chairman',
-  'hash3': Desktops.MemberDesktopModel.manifest, //'Member',
-  'hash4': Desktops.SetupDesktopModel.manifest, //Setup
+interface WorkspaceMenuItem {
+  workspaceName: string
+  title: string
+  icon: string
+  mainRoute: RouteRecordRaw | null
+  meta: RouteMeta
 }
 
-const namespace = 'desktops';
-
-interface IDesktopStore {
-  online: Ref<boolean | undefined>
-  health: Ref<IHealthResponse | undefined>
-  currentDesktop: Ref<IDesktop | undefined>
-  availableDesktops: Ref<IDesktop[]>
-  defaultDesktopHash: Ref<string | undefined>
-  healthCheck: () => Promise<void>;
-  setActiveDesktop: (hash: string | undefined) => void;
-  loadDesktops: () => Promise<void>;
-  getSecondLevel: (currentRoute: RouteLocationNormalized) => RouteRecordRaw[]
-  firstLevel: ComputedRef<IRoute[]>;
-}
-
-
-function getNestedRoutes(route: RouteRecordRaw):RouteRecordRaw[]  {
-  if (!route.children) {
-    return [];
-  }
-
-  let nestedRoutes: RouteRecordRaw[] = [];
-
-  for (const child of route.children) {
-    nestedRoutes.push(child);
-    nestedRoutes = nestedRoutes.concat(getNestedRoutes(child));
+const namespace = 'desktops'
+
+export const useDesktopStore = defineStore(namespace, () => {
+  const currentDesktop = ref<IDesktopWithNavigation>()
+  const health = ref<IHealthResponse>()
+  const online = ref<boolean>()
+
+  async function loadDesktop(): Promise<void> {
+    const newDesktop = await api.getDesktop();
+    // Если уже есть расширения, мерджим маршруты
+    if (currentDesktop.value && currentDesktop.value.workspaces) {
+      newDesktop.workspaces.forEach(newWs => {
+        const oldWs = currentDesktop.value?.workspaces.find(ws => ws.name === newWs.name);
+        if (oldWs && (oldWs as any).routes) {
+          (newWs as any).routes = (oldWs as any).routes;
+        }
+      });
+    }
+    // Добавляем поле backNavigationButton если оно отсутствует
+    currentDesktop.value = {
+      ...newDesktop,
+      backNavigationButton: currentDesktop.value?.backNavigationButton || null
+    };
   }
 
-  return nestedRoutes;
-}
-
-export const useDesktopStore = defineStore(namespace, (): IDesktopStore => {
-  const currentDesktop = ref<IDesktop>()
-  const availableDesktops = ref<IDesktop[]>([])
-  const defaultDesktopHash = ref<string>()
-  const health = ref<IHealthResponse | undefined>()
-  const online = ref<boolean | undefined>()
-
-
-
   async function healthCheck(): Promise<void> {
     try {
+      health.value = await api.healthCheck();
+      online.value = health.value.status !== 'maintenance';
+      if (!online.value) setTimeout(healthCheck, 10000);
+    } catch {
+      online.value = false;
+      setTimeout(healthCheck, 10000);
+    }
+  }
 
-      health.value = await api.healthCheck()
-
-      if (health.value.status != 'maintenance'){
-        if (online.value === false){
-          online.value = true
-        }
-      } else {
-        online.value = false
-        setTimeout(healthCheck, 10000)
-      }
-
-    } catch (e) {
-      online.value = false
-      setTimeout(healthCheck, 10000)
+  function setRoutes(workspaceName: string, routes: RouteRecordRaw[]): void {
+    if (!currentDesktop.value) return;
+    const ws = currentDesktop.value.workspaces.find(w => w.name === workspaceName);
+    if (ws) {
+      (ws as any).routes = routes;
     }
   }
 
-  const firstLevel = computed(() => {
-    if (currentDesktop.value)
-      return currentDesktop.value.routes
-    else return []
+  const workspaceMenus = computed<WorkspaceMenuItem[]>(() => {
+    if (!currentDesktop.value) return [];
+    return currentDesktop.value.workspaces.map(ws => {
+      const routes: RouteRecordRaw[] = (ws as any).routes || [];
+      const meta: RouteMeta = routes.length > 0 && routes[0].meta
+        ? routes[0].meta as RouteMeta
+        : { title: ws.title, icon: '', roles: [] };
+      return {
+        workspaceName: ws.name,
+        title: ws.title,
+        icon: meta.icon,
+        mainRoute: routes.length > 0 ? routes[0] : null,
+        meta
+      };
+    });
   });
 
-
-  const getSecondLevel = (currentRoute: RouteLocationNormalized): RouteRecordRaw[] => {
-    if (currentRoute.matched && currentDesktop.value && currentRoute) {
-
-      const matchingRootRoute = currentRoute.matched[1]
-
-      if (matchingRootRoute) {
-        return getNestedRoutes(matchingRootRoute)
-      }
-    }
-    return [];
+  // Храним название активного workspace
+  const activeWorkspaceName = ref<string | null>(null);
+  function selectWorkspace(name: string) {
+    activeWorkspaceName.value = name;
   }
 
+  const activeSecondLevelRoutes = computed((): RouteRecordRaw[] => {
+    if (!activeWorkspaceName.value) return [];
+    const ws = workspaceMenus.value.find(menu => menu.workspaceName === activeWorkspaceName.value);
+    return ws && ws.mainRoute && ws.mainRoute.children
+      ? ws.mainRoute.children as RouteRecordRaw[]
+      : [];
+  });
 
-  const setActiveDesktop = (hash: string | undefined) => {
-    const desktop = availableDesktops.value.find(d => d.hash === hash)
-    if (desktop)
-      currentDesktop.value = desktop
-    else {
-      FailAlert('Рабочий стол не найден')
+  function registerWorkspaceMenus(router: Router): void {
+    const baseRoute = router.getRoutes().find(r => r.name === 'base');
+    if (baseRoute) {
+      workspaceMenus.value.forEach(menu => {
+        if (menu.mainRoute) {
+          router.addRoute('base', menu.mainRoute as RouteRecordRaw);
+        }
+      });
     }
   }
 
-  const loadAvailableDesktops = async(): Promise<IBlockchainDesktops> => {
-    return { //load it from bc later
-      defaultHash: 'hash1',
-      availableHashes: ['hash1','hash2', 'hash3']
+  // Новый метод: удаляет workspace (расширение) из currentDesktop.workspaces по имени
+  function removeWorkspace(workspaceName: string): void {
+    if (currentDesktop.value && currentDesktop.value.workspaces) {
+      currentDesktop.value.workspaces = currentDesktop.value.workspaces.filter(ws => ws.name !== workspaceName);
     }
   }
 
+  // Методы для управления навигацией
+  function setBackNavigationButton(button: IBackNavigationButton) {
+    if (!currentDesktop.value) return
+    currentDesktop.value.backNavigationButton = button
+  }
 
-  const loadDesktops = async () => {
-    const {defaultHash, availableHashes} = await loadAvailableDesktops()
-    availableDesktops.value = []
-    defaultDesktopHash.value = defaultHash
-
-    availableHashes.map(hash => availableDesktops.value.push(
-      desktopHashMap[hash as any]
-    ))
+  function removeBackNavigationButton(componentId: string) {
+    if (!currentDesktop.value) return
+    if (currentDesktop.value.backNavigationButton?.componentId === componentId) {
+      currentDesktop.value.backNavigationButton = null
+    }
   }
 
+  const backNavigationButton = computed(() => currentDesktop.value?.backNavigationButton)
+
   return {
-    online,
-    health,
-    defaultDesktopHash, //перезапишем через локал-сторадж для пользовательского управления стартовой страницей
     currentDesktop,
-    availableDesktops,
-    setActiveDesktop,
-    loadDesktops,
-    getSecondLevel,
-    firstLevel,
-    healthCheck
-  }
-})
+    health,
+    online,
+    loadDesktop,
+    healthCheck,
+    setRoutes,
+    workspaceMenus,
+    activeWorkspaceName,
+    selectWorkspace,
+    activeSecondLevelRoutes,
+    registerWorkspaceMenus,
+    removeWorkspace,
+    // Новые методы
+    setBackNavigationButton,
+    removeBackNavigationButton,
+    backNavigationButton
+  };
+});

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

@@ -1,4 +1,7 @@
-export interface IDesktop {
+import type { Queries } from '@coopenomics/sdk';
+
+export type IDesktop = Queries.Desktop.GetDesktop.IOutput[typeof Queries.Desktop.GetDesktop.name]
+export interface ILegacyDesktop {
   name: string;
   hash: string;
   authorizedHome: string;
@@ -28,3 +31,13 @@ export interface IRoute {
 }
 
 export type { IHealthResponse } from '@coopenomics/controller'
+
+export interface IBackNavigationButton {
+  text: string
+  onClick: () => void
+  componentId: string
+}
+
+export interface IDesktopWithNavigation extends IDesktop {
+  backNavigationButton: IBackNavigationButton | null
+}

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

@@ -0,0 +1,24 @@
+import { client } from 'src/shared/api/client';
+import { Queries } from '@coopenomics/sdk';
+import type { IGetDocuments, ZGetDocumentsResult } from '../model/types';
+
+/**
+ * Загрузка документов с сервера
+ * @param data параметры запроса документов
+ * @returns результат запроса с пагинацией и документами
+ */
+async function loadDocuments(data: IGetDocuments): Promise<ZGetDocumentsResult> {
+  const { getDocuments: output } = await client.Query(
+    Queries.Documents.GetDocuments.query,
+    {
+      variables: {
+        data
+      }
+    }
+  );
+  return output;
+}
+
+export const api = {
+  loadDocuments
+}

package/src/entities/Document/index.ts

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