@coopenomics/desktop 2025.7.3 → 2025.11.8-alpha-2

package/src/pages/ExtensionStore/ExtensionPage/ExtensionPage.vue

@@ -1,91 +1,66 @@
 <template lang="pug">
-div(v-if="extension").row
-  div.col-md-3.col-sm-4.col-xs-12.q-pa-md
-    q-img(v-if="extension.image" :src="extension.image")
-    div.q-mt-md
-      div(v-if="isSettings").row
-        q-btn( v-if="!isEmpty" color="teal" @click="save").full-width сохранить
-        q-btn( v-if="isEmpty" @click="cancel" flat icon="fas fa-arrow-left").full-width назад
-      div(v-if="isMain && !extension.is_installed").q-gutter-sm.text-center
-        q-btn(color="teal" @click="router.push({name: 'extension-install'})").full-width установить
-
-      div(v-if="isInstall && !extension.is_installed").q-gutter-sm.text-center
-        // это установка
-        q-btn(color="teal" @click="install").full-width включить
-
-      div(v-if="isMain && extension.is_installed")
-        q-btn(color="teal" @click="openSettings").full-width настройки
-        div(v-if="extension.is_builtin").q-mt-sm
-          p.text-center.text-grey минимальное расширение
-        div(v-else).row
-          div.col-6.q-pa-sm
-            q-btn(v-if="extension.enabled" size="sm" @click="disable" flat :disabled="extension.is_builtin").full-width
-              q-icon(name="fa-solid fa-toggle-on")
-              span.q-ml-xs включено
-
-            q-btn( size="sm" @click="enable" v-if="!extension.enabled" flat :disabled="extension.is_builtin").full-width
-              q-icon(name="fa-solid fa-toggle-off").text-grey
-              span.q-ml-xs отключено
-
-          div.col-6.q-pa-sm
-            q-btn( size="sm" @click="uninstall" v-if="extension.is_installed" flat :disabled="extension.is_builtin").full-width
-              q-icon(name="delete").text-grey
-              span.q-ml-xs удалить
-
-  div.col-md-9.col-sm-8.col-xs-12.q-pa-md
-    div(v-if="isMain").info-card
-      div
-        span.text-h1 {{extension.title}}
-          //- q-chip(square dense size="sm" color="green" outline v-if="extension.is_installed && extension.enabled").q-ml-sm установлено
-          //- q-chip(square dense size="sm" color="orange" outline v-if="extension.is_installed && !extension.enabled").q-ml-sm отключено
-          q-chip(size="sm" dense color="orange" v-if="!extension.is_available" outline) в разработке
-        div
-          q-chip(outline v-for="tag in extension.tags" v-bind:key="tag" dense size="sm") {{tag}}
-
-      ClientOnly
-        template(#default)
-          vue-markdown(:source="extension.readme").description.q-mt-md
-    div(v-if="(isSettings || isInstall) && extension.schema").info-card
-      q-form(ref="myFormRef")
-        div(v-if="isEmpty && !isInstall")
-          div.q-pa-md
-            p.text-h6 Нет настроек
-            span Расширение не предоставило настроек для изменения.
-        div(v-if="!isEmpty && !isInstall")
-
-          //- vue-markdown(:source="extension.instructions").description.q-mt-md
-          ClientOnly
-            template(#default)
-              vue-markdown(v-if="extension.instructions && isInstall" :source="extension.instructions").description.q-mt-md
-          div
-            p.text-h5 Настройки
-            ZodForm(:schema="extension.schema" v-model="data").q-mt-lg
-
+.row(v-if='extension')
+  .col-md-3.col-sm-4.col-xs-12.q-pa-md
+    ExtensionImage(:image='extension?.image ?? undefined')
+    .q-mt-md
+      ExtensionActions(
+        :extension='extension',
+        :mode='currentMode',
+        :config='data',
+        :form-ref='myFormRef',
+        :is-empty='isEmpty'
+      )
+
+  .col-md-9.col-sm-8.col-xs-12.q-pa-md
+    ExtensionInfo(v-if='isMain', :extension='extension')
+    ExtensionSettings(
+      v-if='isSettings && extension.schema',
+      :schema='extension.schema',
+      v-model:config='data',
+      :form-ref='myFormRef'
+    )
+    ExtensionInstall(
+      v-if='isInstall',
+      :schema='extension.schema',
+      v-model:config='data',
+      :instructions='extension.instructions',
+      :form-ref='myFormRef'
+    )
 </template>
 <script lang="ts" setup>
 import { useExtensionStore } from 'src/entities/Extension/model';
-import { computed, onMounted, ref, watch, defineAsyncComponent } from 'vue';
+import { computed, onMounted, ref, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
-import { ZodForm } from 'src/shared/ui/ZodForm';
-// import VueMarkdown from 'vue-markdown-render'
-import { extractGraphQLErrorMessages, FailAlert, SuccessAlert } from 'src/shared/api';
-import { useUpdateExtension } from 'src/features/Extension/UpdateExtension';
-import { useUninstallExtension } from 'src/features/Extension/UninstallExtension';
-import { useInstallExtension } from 'src/features/Extension/InstallExtension';
-import { useDesktopStore } from 'src/entities/Desktop/model';
-import { ClientOnly } from 'src/shared/ui/ClientOnly';
-
-// Клиентский компонент для markdown, загружаемый только на клиенте
-const VueMarkdown = defineAsyncComponent(() =>
-  import('vue-markdown-render').then(mod => mod.default)
-);
+import { useBackButton } from 'src/shared/lib/navigation';
+import { ExtensionImage } from 'src/widgets/ExtensionImage';
+import { ExtensionActions } from 'src/widgets/ExtensionActions';
+import { ExtensionInfo } from 'src/widgets/ExtensionInfo';
+import { ExtensionSettings } from 'src/widgets/ExtensionSettings';
+import { ExtensionInstall } from 'src/widgets/ExtensionInstall';
 
 const route = useRoute();
 const router = useRouter();
 const extStore = useExtensionStore();
 const data = ref({});
 const myFormRef = ref();
-const desktop = useDesktopStore()
+
+
+// Настраиваем кнопку "Назад" в хедере
+const backButtonClick = () => {
+  if (route.name === 'one-extension') {
+    // На главной странице расширения - возвращаемся к списку расширений
+    router.push({ name: 'extensions' });
+  } else if (route.name === 'extension-install' || route.name === 'extension-settings') {
+    // На страницах установки/настроек - возвращаемся на главную страницу расширения
+    router.push({ name: 'one-extension', params: { name: route.params.name } });
+  }
+};
+
+useBackButton({
+  text: 'Назад',
+  componentId: 'extension-page',
+  onClick: backButtonClick
+});
 
 onMounted(async () => {
   if (route.params.name) {
@@ -93,114 +68,30 @@ onMounted(async () => {
   }
 });
 
-const extension = computed(() => extStore.extensions.find(el => el.name == route.params.name));
-
-const validateForm = async () => {
-  return await myFormRef.value?.validate();
-};
+const extension = computed(() =>
+  extStore.extensions.find((el) => el.name == route.params.name),
+);
 
 watch(extension, (newValue) => {
-  if (newValue)
-    data.value = newValue.config;
+  if (newValue) data.value = newValue.config;
 });
 
-const openSettings = () => {
-  router.push({ name: 'extension-settings' });
-};
-
-
-const cancel = () => {
-  router.push({ name: 'one-extension' });
-};
-
-const save = async () => {
-  const is_valid = await validateForm();
-  if (!is_valid) return;
-
-  const { updateExtension } = useUpdateExtension();
-  if (extension.value) {
-    try {
-      await updateExtension(extension.value.name, extension.value.enabled, data.value);
-      SuccessAlert('Расширение обновлено');
-      router.push({ name: 'one-extension' });
-    } catch (e: unknown) {
-      FailAlert(`Ошибка сохранения расширения: ${extractGraphQLErrorMessages(e)}`);
-    }
-  }
-};
-
-const install = async () => {
-  const is_valid = await validateForm();
-  if (!is_valid) return;
-
-  const { installExtension } = useInstallExtension();
-  if (extension.value) {
-    try {
-      await installExtension(extension.value.name, true, data.value);
-      router.push({ name: 'one-extension' });
-      desktop.loadDesktop()
-      SuccessAlert('Расширение установлено');
-    } catch (e: unknown) {
-      FailAlert(`Ошибка установки расширения: ${extractGraphQLErrorMessages(e)}`);
-    }
-  }
-};
-
-const disable = async () => {
-  const { updateExtension } = useUpdateExtension();
-  if (extension.value) {
-    try {
-      await updateExtension(extension.value.name, false, extension.value.config);
-      // Если расширение отключено, удаляем его workspace
-      desktop.removeWorkspace(extension.value.name);
-
-      SuccessAlert('Расширение обновлено');
-    } catch (e: unknown) {
-      FailAlert(`Ошибка отключения расширения: ${extractGraphQLErrorMessages(e)}`);
-    }
-  }
-};
-
-const enable = async () => {
-  const { updateExtension } = useUpdateExtension();
-  if (extension.value) {
-    try {
-      await updateExtension(extension.value.name, true, extension.value.config);
-
-      // Перезагружаем desktop с сервера, чтобы включённое расширение появилось
-      await desktop.loadDesktop();
-
-      SuccessAlert('Расширение обновлено');
-    } catch (e: any) {
-      FailAlert(`Ошибка включения расширения: ${extractGraphQLErrorMessages(e)}`);
-    }
-  }
-};
-
-
-const uninstall = async () => {
-  const { uninstallExtension } = useUninstallExtension();
-  if (extension.value) {
-    try {
-      await uninstallExtension(extension.value.name);
-      router.push({ name: 'one-extension' });
-      desktop.loadDesktop()
-      SuccessAlert('Расширение удалено');
-    } catch (e: any) {
-      FailAlert(`Ошибка удаления расширения: ${extractGraphQLErrorMessages(e)}`);
-    }
-  }
-};
-
 const isMain = computed(() => route.name == 'one-extension');
 const isInstall = computed(() => route.name == 'extension-install');
 const isSettings = computed(() => route.name == 'extension-settings');
 
+const currentMode = computed(() => {
+  if (isMain.value) return 'main';
+  if (isInstall.value) return 'install';
+  if (isSettings.value) return 'settings';
+  return 'main';
+});
+
 const isEmpty = computed(() => {
   if (extension.value?.schema)
-    return Object.keys(extension.value?.schema.properties).length == 0
-  else return false
-})
+    return Object.keys(extension.value?.schema.properties).length == 0;
+  else return false;
+});
 </script>
 
 <style>

package/src/pages/ExtensionStore/ExtensionsManagement/ExtensionsManagement.vue

@@ -0,0 +1,49 @@
+<template lang="pug">
+div
+  // Контент страницы расширений
+  router-view
+</template>
+
+<script lang="ts" setup>
+import { onMounted, onBeforeUnmount, computed, markRaw } from 'vue';
+import { useHeaderActions } from 'src/shared/hooks';
+import { RouteMenuButton } from 'src/shared/ui';
+
+// Массив кнопок меню для шапки
+const menuButtons = computed(() => [
+  {
+    id: 'extensions-showcase-menu',
+    component: markRaw(RouteMenuButton),
+    props: {
+      routeName: 'extstore-showcase',
+      label: 'Витрина',
+    },
+    order: 1,
+  },
+  {
+    id: 'extensions-installed-menu',
+    component: markRaw(RouteMenuButton),
+    props: {
+      routeName: 'appstore-installed',
+      label: 'Установленные',
+    },
+    order: 2,
+  },
+]);
+
+// Регистрируем кнопки меню в header
+const { registerAction: registerHeaderAction, clearActions } = useHeaderActions();
+
+// Регистрируем действия в header
+onMounted(() => {
+  // Регистрируем кнопки меню
+  menuButtons.value.forEach(button => {
+    registerHeaderAction(button);
+  });
+});
+
+// Явно очищаем кнопки при уходе со страницы
+onBeforeUnmount(() => {
+  clearActions();
+});
+</script>

package/src/pages/ExtensionStore/ExtensionsManagement/index.ts

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

package/src/pages/ExtensionStore/InstalledExtensions/InstalledExtensions.vue

@@ -1,18 +1,24 @@
 <template lang="pug">
-  div.row
-    div(v-for="extension in extStore.extensions" v-bind:key="extension.name").col-md-3.col-xs-12
-      ExtensionCard(:extension="extension")
+.row
+  .col-md-3.col-xs-12(
+    v-for='extension in installedExtensions',
+    v-bind:key='extension.name'
+  )
+    ExtensionCard(:extension='extension')
+</template>
+<script lang="ts" setup>
+import { useExtensionStore } from 'src/entities/Extension/model';
+import { onMounted, computed } from 'vue';
+import { ExtensionCard } from 'src/widgets/ExtensionCard';
 
-  </template>
-  <script lang="ts" setup>
-  import { useExtensionStore } from 'src/entities/Extension/model'
-  import { onMounted } from 'vue';
-  import { ExtensionCard } from 'src/widgets/ExtensionCard'
+const extStore = useExtensionStore();
 
-  const extStore = useExtensionStore()
+// Фильтруем только установленные И доступные расширения (исключаем "в разработке")
+const installedExtensions = computed(() =>
+  extStore.extensions.filter((ext) => ext.is_installed && ext.is_available),
+);
 
-  onMounted(async () => {
-    extStore.loadExtensions({ is_installed: true })
-  })
-
-  </script>
+onMounted(async () => {
+  extStore.loadExtensions({ is_installed: true });
+});
+</script>

package/src/pages/PermissionDenied/PermissionDenied.vue

@@ -1,20 +1,48 @@
 <template lang="pug">
-div.row.justify-center
-  q-card(flat bordered).q-pa-md.q-mt-lg
+.row.justify-center
+  q-card.q-pa-md.q-mt-lg(flat, bordered)
     q-card-section
-      div.full-width.text-center
-        q-badge(color="red").q-pa-sm
-          q-icon(name="fa-regular fa-hand" size="48px")
-      div(class="text-h4") Недостаточно прав доступа
+      .full-width.text-center
+        q-badge.q-pa-sm(color='red')
+          q-icon(name='fa-regular fa-hand', size='48px')
+      .text-h4 Недостаточно прав доступа
 
-    q-card-actions(align="center")
-      q-btn(label="Вернуться" color="primary" icon="fa fa-arrow-left" @click="goBack")
+    q-card-actions(align='center')
+      q-btn(
+        label='Вернуться',
+        color='primary',
+        icon='fa fa-arrow-left',
+        @click='goBack'
+      )
 </template>
 <script lang="ts" setup>
-import { useRouter } from 'vue-router'
-const router = useRouter()
+import { useRouter } from 'vue-router';
+import { useDesktopStore } from 'src/entities/Desktop/model';
+import { useSessionStore } from 'src/entities/Session';
+import { useCurrentUser } from 'src/entities/Session';
+
+const router = useRouter();
+const desktops = useDesktopStore();
+const session = useSessionStore();
+const currentUser = useCurrentUser();
 
 function goBack() {
-  router.push({ name: 'index' });
+  // Если пользователь авторизован, пытаемся перейти на безопасную страницу
+  if (session.isAuth && currentUser.isRegistrationComplete.value) {
+    // Пытаемся перейти на participant workspace как самый безопасный вариант
+    const hasParticipantWorkspace = desktops.currentDesktop?.workspaces.some(
+      (ws) => ws.name === 'participant',
+    );
+
+    if (hasParticipantWorkspace) {
+      // Устанавливаем participant workspace и переходим на его главную страницу
+      desktops.selectWorkspace('participant');
+      desktops.goToDefaultPage(router);
+      return;
+    }
+  }
+
+  // Если ничего не найдено, идем на страницу по умолчанию для неавторизованного пользователя
+  desktops.goToDefaultPage(router);
 }
-</script>
+</script>

package/src/pages/Privacy/PrivacyPage.vue

@@ -0,0 +1,11 @@
+<template lang="pug">
+q-page
+  div.row.justify-center
+    div.col-md-10.col-xs-12
+      div.q-pa-md
+        StaticPrivacyPolicy
+</template>
+
+<script setup lang="ts">
+import { StaticPrivacyPolicy } from 'src/features/Agreementer/StaticPrivacyPolicy';
+</script>

package/src/pages/Privacy/index.ts

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

package/src/pages/Registrator/Invite/index.ts

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

package/src/pages/Registrator/Invite/ui/InvitePage.vue

@@ -0,0 +1,9 @@
+<template lang="pug">
+.row.justify-center.q-pa-sm
+  .col-md-4.col-sm-6.col-xs-12
+    Invite.q-mt-lg
+
+</template>
+<script lang="ts" setup>
+import { Invite } from 'src/widgets/Registrator/Invite';
+</script>

package/src/pages/Registrator/Invite/ui/index.ts

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

package/src/pages/Registrator/SignIn/ui/SignInPage.vue

@@ -11,14 +11,12 @@
           @click='router.push({ name: "lostkey" })'
         ) потеряли ключ?
         q-btn(flat, size='sm', dense, @click='router.push({ name: "signup" })') нет аккаунта?
-    AlreadyRegistered.q-mt-lg(v-else)
 </template>
 <script lang="ts" setup>
 import { useSessionStore } from 'src/entities/Session';
 import { useCurrentUser } from 'src/entities/Session';
 import { SignIn } from 'src/widgets/Registrator/SignIn';
 import { computed } from 'vue';
-import { AlreadyRegistered } from 'src/widgets/Registrator/AlreadyRegistered';
 import { useRouter } from 'vue-router';
 import { useRegistratorStore } from 'src/entities/Registrator';
 const store = useRegistratorStore().state;

package/src/pages/Registrator/SignUp/GenerateAccount.vue

@@ -1,22 +1,29 @@
-<template lang='pug'>
+<template lang="pug">
 div
-  q-step(:name='store.steps.GenerateAccount', title='Получите приватный ключ и надежно сохраните его для цифровой подписи', :done='store.isStepDone("GenerateAccount")')
+  q-step(
+    :name='store.steps.GenerateAccount',
+    title='Получите приватный ключ и надежно сохраните его для цифровой подписи',
+    :done='store.isStepDone("GenerateAccount")'
+  )
     div
       p.full-width Приватный ключ используется для входа в систему и подписи документов. Мы рекомендуем сохранить его в бесплатном менеджере паролей, таком как
-        a(href="https://bitwarden.com/download" target="_bank").q-ml-xs Bitwarden
+        a.q-ml-xs(href='https://bitwarden.com/download', target='_bank') Bitwarden
         | .
 
-
     q-input.q-mt-lg(
+      ref='privateKeyInput'
       v-if='account.private_key',
       :model-value='account.private_key',
       label='Приватный ключ'
     )
 
-    q-checkbox(v-model="i_save", label="Я сохранил имя и ключ в надёжном месте")
+    q-checkbox(
+      v-model='i_save',
+      label='Я сохранил имя и ключ в надёжном месте'
+    )
 
     .q-mt-lg
-      q-btn.col-md-6.col-xs-12(flat, @click="store.prev()")
+      q-btn.col-md-6.col-xs-12(flat, @click='store.prev()')
         i.fa.fa-arrow-left
         span.q-ml-md назад
 
@@ -24,60 +31,81 @@ div
         i.fa.fa-copy
         span.q-ml-md скопировать
 
-      q-btn.q-mt-lg.q-mb-lg(color='primary', :disabled="!i_save" @click='setAccount')
+      q-btn.q-mt-lg.q-mb-lg(
+        color='primary',
+        :disabled='!i_save',
+        :loading='isLoading',
+        @click='setAccount'
+      )
         | Продолжить
         q-tooltip подтвердите сохранение ключа для продолжения
 </template>
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
-import { useCreateUser } from 'src/features/User/CreateUser'
-import { Notify, copyToClipboard } from 'quasar'
-import { useRegistratorStore } from 'src/entities/Registrator'
-import { Classes } from '@coopenomics/sdk'
-
-const store = useRegistratorStore()
-
-import { FailAlert } from 'src/shared/api'
-
-const api = useCreateUser()
-const i_save = ref(false)
-const account = ref(store.state.account)
-
-if (!account.value.private_key || !account.value.public_key || !account.value.username)
-  account.value = new Classes.Account()
-
-const email = computed(() => store.state.email)
-const userData = computed(() => store.state.userData)
+import { ref, computed, nextTick, watch } from 'vue';
+import { useCreateUser } from 'src/features/User/CreateUser';
+import { copyToClipboard } from 'quasar';
+import { useRegistratorStore } from 'src/entities/Registrator';
+import { SuccessAlert } from 'src/shared/api';
+import { Classes } from '@coopenomics/sdk';
+
+const store = useRegistratorStore();
+
+import { FailAlert } from 'src/shared/api';
+
+const api = useCreateUser();
+const i_save = ref(false);
+const account = ref(store.state.account);
+const privateKeyInput = ref<any>();
+const isLoading = ref(false);
+
+if (
+  !account.value.private_key ||
+  !account.value.public_key ||
+  !account.value.username
+)
+  account.value = new Classes.Account();
+
+const email = computed(() => store.state.email);
+const userData = computed(() => store.state.userData);
+
+// Автоматическое выделение приватного ключа при его генерации
+watch(
+  () => account.value.private_key,
+  (newKey) => {
+    if (newKey) {
+      nextTick(() => {
+        privateKeyInput.value?.select();
+      });
+    }
+  },
+  { immediate: true }
+);
 
 const copyMnemonic = () => {
-  const toCopy = `${account.value.private_key}`
+  const toCopy = `${account.value.private_key}`;
 
   copyToClipboard(toCopy)
     .then(() => {
-      Notify.create({
-        message: 'Информация скопирована в буфер обмена',
-        type: 'positive',
-      })
+      SuccessAlert('Приватный ключ скопирован в буфер обмена');
     })
     .catch((e) => {
-      console.log(e)
-    })
-}
+      console.log(e);
+    });
+};
 
 const setAccount = async () => {
+  isLoading.value = true;
   try {
-
-    await api.createUser(email.value, userData.value, account.value)
-    store.state.account = account.value
-    if (store.isBranched)
-      store.goTo('SelectBranch')
-    else
-      store.goTo('ReadStatement')
-
+    await api.createUser(email.value, userData.value, account.value);
+    store.state.account = account.value;
+    if (store.isBranched) store.goTo('SelectBranch');
+    else store.goTo('ReadStatement');
   } catch (e: any) {
-    store.goTo('SetUserData')
-    console.error(e)
-    FailAlert(e)
+    store.goTo('SetUserData');
+    console.error(e);
+    FailAlert(e);
+  } finally {
+    isLoading.value = false;
   }
-}
+};
 </script>