@coopenomics/desktop 2025.7.3 → 2025.11.8-alpha-2

package/extensions/capital/features/Commit/CreateCommit/model/index.ts

@@ -0,0 +1,55 @@
+import { ref, type Ref } from 'vue';
+import type { Mutations } from '@coopenomics/sdk';
+import { api } from '../api';
+import { type ICreateCommitOutput } from 'app/extensions/capital/entities/Commit/model';
+import { useTimeStatsStore } from 'app/extensions/capital/entities/TimeStats/model';
+import { useSystemStore } from 'src/entities/System/model';
+
+export type ICreateCommitInput = Mutations.Capital.CreateCommit.IInput['data'];
+
+export function useCreateCommit(projectHash?: string, username?: string) {
+  const timeStatsStore = useTimeStatsStore();
+  const { info } = useSystemStore();
+
+  const initialCreateCommitInput: ICreateCommitInput = {
+    commit_hash: '',
+    coopname: '',
+    commit_hours: 0,
+    description: '',
+    meta: '',
+    project_hash: projectHash || '',
+    username: username || '',
+  };
+
+  const createCommitInput = ref<ICreateCommitInput>({
+    ...initialCreateCommitInput,
+  });
+
+  // Универсальная функция для сброса объекта к начальному состоянию
+  function resetInput(
+    input: Ref<ICreateCommitInput>,
+    initial: ICreateCommitInput,
+  ) {
+    Object.assign(input.value, initial);
+  }
+
+  async function createCommit(
+    data: ICreateCommitInput,
+  ): Promise<ICreateCommitOutput> {
+    const transaction = await api.createCommit(data);
+
+    // Обновляем статистику времени для проекта после создания коммита
+    await timeStatsStore.loadTimeStat({
+      username: data.username,
+      project_hash: data.project_hash,
+      coopname: data.coopname || info.coopname,
+    });
+
+    // Сбрасываем createCommitInput после выполнения createCommit
+    resetInput(createCommitInput, initialCreateCommitInput);
+
+    return transaction;
+  }
+
+  return { createCommit, createCommitInput };
+}

package/extensions/capital/features/Commit/CreateCommit/ui/CreateCommitButton.vue

@@ -0,0 +1,105 @@
+<template lang="pug">
+q-btn(
+  color='accent',
+  @click.stop='showDialog = true',
+  :loading='loading',
+  label="Коммит",
+  icon="add",
+  :size='mini ? "sm" : "md"',
+  :dense="isMobile"
+  :disabled='disabled'
+)
+
+  q-dialog(v-model='showDialog', @hide='clear')
+    ModalBase(:title='"Создать коммит"')
+      Form.q-pa-md(
+        :handler-submit='handleCreateCommit',
+        :is-submitting='isSubmitting',
+        :button-submit-txt='"Создать"',
+        :button-cancel-txt='"Отмена"',
+        @cancel='clear'
+      )
+        q-input(
+          v-model='formData.description',
+          outline
+          label='Описание коммита',
+          :rules='[(val) => !!val || "Описание обязательно"]',
+          autocomplete='off'
+          placeholder='Опишите изменения...'
+        )
+</template>
+
+<script setup lang="ts">
+import { ref, watch } from 'vue';
+import { useCreateCommit } from '../model';
+import { useSystemStore } from 'src/entities/System/model';
+import { useCurrentUser } from 'src/entities/Session/composables/useCurrentUser';
+import { generateUniqueHash } from 'src/shared/lib/utils/generateUniqueHash';
+import { FailAlert, SuccessAlert } from 'src/shared/api/alerts';
+import { ModalBase } from 'src/shared/ui/ModalBase';
+import { Form } from 'src/shared/ui/Form';
+import { useWindowSize } from 'src/shared/hooks';
+
+const { isMobile } = useWindowSize();
+const props = defineProps<{
+  mini?: boolean;
+  projectHash?: string;
+  uncommittedHours?: number;
+  disabled?: boolean;
+}>();
+
+const system = useSystemStore();
+const { username } = useCurrentUser();
+const { createCommit, createCommitInput } = useCreateCommit(props.projectHash, username);
+
+const loading = ref(false);
+const showDialog = ref(false);
+const isSubmitting = ref(false);
+
+const formData = ref({
+  creator_hours: 0,
+  description: '',
+});
+
+// Устанавливаем часы при открытии диалога
+watch(showDialog, (isOpen) => {
+  if (isOpen) {
+    formData.value.creator_hours = props.uncommittedHours || 0;
+  }
+});
+
+const clear = () => {
+  showDialog.value = false;
+  formData.value = {
+    creator_hours: props.uncommittedHours || 0,
+    description: '',
+  };
+};
+
+const handleCreateCommit = async () => {
+  try {
+    isSubmitting.value = true;
+
+    const commitHash = await generateUniqueHash();
+
+    // Создаем данные для коммита с учетом формы и контекста
+    const commitData = {
+      commit_hash: commitHash,
+      coopname: system.info.coopname,
+      commit_hours: formData.value.creator_hours,
+      project_hash: props.projectHash || createCommitInput.value.project_hash,
+      username: username || createCommitInput.value.username,
+      description: formData.value.description,
+      meta: JSON.stringify({}),
+    };
+
+    await createCommit(commitData);
+    SuccessAlert('Коммит успешно создан');
+    clear();
+  } catch (error) {
+    FailAlert(error);
+  } finally {
+    isSubmitting.value = false;
+  }
+};
+</script>

package/extensions/capital/features/Commit/CreateCommit/ui/index.ts

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

package/extensions/capital/features/Commit/DeclineCommit/api/index.ts

@@ -0,0 +1,20 @@
+import type { IDeclineCommitOutput } from '../model';
+import { client } from 'src/shared/api/client';
+import { Mutations } from '@coopenomics/sdk';
+
+async function declineCommit(
+  data: Mutations.Capital.DeclineCommit.IInput['data'],
+): Promise<IDeclineCommitOutput> {
+  const { [Mutations.Capital.DeclineCommit.name]: result } =
+    await client.Mutation(Mutations.Capital.DeclineCommit.mutation, {
+      variables: {
+        data,
+      },
+    });
+
+  return result;
+}
+
+export const api = {
+  declineCommit,
+};

package/extensions/capital/features/Commit/DeclineCommit/index.ts

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

package/extensions/capital/features/Commit/DeclineCommit/model/index.ts

@@ -0,0 +1,24 @@
+import { api } from '../api';
+import { useCommitStore } from 'app/extensions/capital/entities/Commit/model';
+import { Mutations } from '@coopenomics/sdk';
+
+export type IDeclineCommitInput = Mutations.Capital.DeclineCommit.IInput['data'];
+export type IDeclineCommitOutput =
+  Mutations.Capital.DeclineCommit.IOutput[typeof Mutations.Capital.DeclineCommit.name];
+
+export function useDeclineCommit() {
+  const store = useCommitStore();
+
+  async function declineCommit(
+    data: IDeclineCommitInput,
+  ): Promise<IDeclineCommitOutput> {
+    const commit = await api.declineCommit(data);
+
+    // Обновляем коммит в списке локально
+    store.updateCommitInList(commit);
+
+    return commit;
+  }
+
+  return { declineCommit };
+}

package/extensions/capital/features/Commit/DeclineCommit/ui/DeclineCommitButton.vue

@@ -0,0 +1,79 @@
+<template lang="pug">
+q-btn(
+  color='negative',
+  @click='showDialog = true',
+  :loading='loading',
+  label="Отклонить",
+  :size='mini ? "sm" : "md"',
+  :dense="isMobile"
+)
+
+  q-dialog(v-model='showDialog', @hide='clear')
+    ModalBase(:title='"Отклонить коммит"')
+      Form.q-pa-md(
+        :handler-submit='handleDeclineCommit',
+        :is-submitting='isSubmitting',
+        :button-submit-txt='"Отклонить"',
+        :button-cancel-txt='"Отмена"',
+        @cancel='clear'
+      )
+        q-input(
+          v-model='reason',
+          outline
+          label='Причина отклонения',
+          :rules='[(val) => !!val || "Причина обязательна"]',
+          autocomplete='off'
+          placeholder='Укажите причину отклонения...'
+          type='textarea'
+          rows='3'
+        )
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import { useDeclineCommit } from '../model';
+import { useSystemStore } from 'src/entities/System/model';
+import { FailAlert, SuccessAlert } from 'src/shared/api/alerts';
+import { ModalBase } from 'src/shared/ui/ModalBase';
+import { Form } from 'src/shared/ui/Form';
+import { useWindowSize } from 'src/shared/hooks';
+
+const { isMobile } = useWindowSize();
+const props = defineProps<{
+  mini?: boolean;
+  commitHash: string;
+}>();
+
+const system = useSystemStore();
+const { declineCommit } = useDeclineCommit();
+
+const loading = ref(false);
+const showDialog = ref(false);
+const isSubmitting = ref(false);
+const reason = ref('');
+
+const clear = () => {
+  showDialog.value = false;
+  reason.value = '';
+};
+
+const handleDeclineCommit = async () => {
+  try {
+    isSubmitting.value = true;
+
+    const declineData = {
+      commit_hash: props.commitHash,
+      coopname: system.info.coopname,
+      reason: reason.value,
+    };
+
+    await declineCommit(declineData);
+    SuccessAlert('Коммит успешно отклонен');
+    clear();
+  } catch (error) {
+    FailAlert(error);
+  } finally {
+    isSubmitting.value = false;
+  }
+};
+</script>

package/extensions/capital/features/Commit/DeclineCommit/ui/index.ts

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

package/extensions/capital/features/Commit/index.ts

@@ -0,0 +1,3 @@
+export * as CreateCommit from './CreateCommit';
+export * as ApproveCommit from './ApproveCommit';
+export * as DeclineCommit from './DeclineCommit';

package/extensions/capital/features/Contributor/EditContributor/api/index.ts

@@ -0,0 +1,24 @@
+import { client } from 'src/shared/api/client';
+import { Mutations } from '@coopenomics/sdk';
+import type { IContributor } from 'app/extensions/capital/entities/Contributor/model/types';
+
+export type IEditContributorInput = Mutations.Capital.EditContributor.IInput['data'];
+export type IEditContributorOutput = IContributor;
+
+async function editContributor(
+  data: IEditContributorInput,
+): Promise<IEditContributorOutput> {
+  const { [Mutations.Capital.EditContributor.name]: result } =
+    await client.Mutation(Mutations.Capital.EditContributor.mutation, {
+      variables: {
+        data,
+      },
+    });
+
+  // Возвращаем только данные contributor, без transaction
+  return result;
+}
+
+export const api = {
+  editContributor,
+};

package/extensions/capital/features/Contributor/EditContributor/index.ts

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

package/extensions/capital/features/Contributor/EditContributor/model/index.ts

@@ -0,0 +1,41 @@
+import { ref } from 'vue';
+import { api, type IEditContributorInput, type IEditContributorOutput } from '../api';
+import { useSessionStore } from 'src/entities/Session/model';
+import { useSystemStore } from 'src/entities/System/model';
+import { useContributorStore } from 'app/extensions/capital/entities/Contributor/model';
+
+export type { IEditContributorInput, IEditContributorOutput };
+
+export function useEditContributor() {
+  const isLoading = ref(false);
+  const { username } = useSessionStore();
+  const { info } = useSystemStore();
+  const contributorStore = useContributorStore();
+
+  const editContributor = async (
+    input: Omit<IEditContributorInput, 'username' | 'coopname'>,
+  ): Promise<IEditContributorOutput> => {
+    isLoading.value = true;
+    try {
+      const data: IEditContributorInput = {
+        ...input,
+        username,
+        coopname: info.coopname,
+      };
+
+      const result = await api.editContributor(data);
+
+      // Обновляем данные в store после успешного редактирования
+      contributorStore.updateSelf(result);
+
+      return result;
+    } finally {
+      isLoading.value = false;
+    }
+  };
+
+  return {
+    editContributor,
+    isLoading,
+  };
+}

package/extensions/capital/features/Contributor/EditContributor/ui/EditAboutInput.vue

@@ -0,0 +1,121 @@
+<template lang="pug">
+ColorCard(color='blue')
+  .card-label О себе
+  template(v-if="!isEditing")
+    .card-value(:class="{ 'cursor-pointer': isOwnProfile }" :style="{ 'white-space': 'pre-line' }" @click="isOwnProfile ? startEditing() : null")
+      template(v-if="isOwnProfile")
+        q-icon(
+          name="edit"
+          size="16px"
+          color="grey-6"
+          style="margin-right: 8px;"
+        )
+      | {{ hasAbout ? contributorStore.self?.about : 'Не указано' }}
+  template(v-else)
+    .q-pa-sm
+      q-input(
+        v-model="localAbout"
+        type="textarea"
+        label="Расскажите о себе и чем можете быть полезны кооперативу"
+        outlined
+        rows="3"
+        :rules="[val => !val || val.length <= 1000 || 'Максимум 1000 символов']"
+        dense
+        autogrow
+      )
+      .row.q-gutter-sm.q-mt-sm.justify-end
+        q-btn(
+          flat
+          dense
+          label="Отмена"
+          color="grey-7"
+          @click="cancelEditing"
+        )
+        q-btn(
+          color="primary"
+          dense
+          label="Сохранить"
+          :loading="isSaving"
+          :disable="!hasChanges"
+          @click="saveAbout"
+        )
+</template>
+
+<script setup lang="ts">
+import { ref, computed, watch } from 'vue';
+import { FailAlert, SuccessAlert } from 'src/shared/api';
+import { useEditContributor } from '../model';
+import { useContributorStore } from 'app/extensions/capital/entities/Contributor/model';
+import { useSessionStore } from 'src/entities/Session/model';
+import { ColorCard } from 'src/shared/ui';
+
+const emit = defineEmits<{
+  'about-updated': [];
+}>();
+
+const contributorStore = useContributorStore();
+const { username } = useSessionStore();
+const { editContributor, isLoading } = useEditContributor();
+
+const isEditing = ref(false);
+const localAbout = ref('');
+const isSaving = computed(() => isLoading.value);
+
+// Проверяем, является ли это профилем текущего пользователя
+const isOwnProfile = computed(() => {
+  return contributorStore.self?.username === username;
+});
+
+// Проверяем, есть ли информация "О себе"
+const hasAbout = computed(() => {
+  return contributorStore.self?.about && contributorStore.self.about.trim().length > 0;
+});
+
+// Проверяем, есть ли изменения
+const hasChanges = computed(() => {
+  const currentAbout = contributorStore.self?.about || '';
+  return localAbout.value.trim() !== currentAbout.trim();
+});
+
+// Начинаем редактирование
+const startEditing = () => {
+  localAbout.value = contributorStore.self?.about || '';
+  isEditing.value = true;
+};
+
+// Отменяем редактирование
+const cancelEditing = () => {
+  isEditing.value = false;
+  localAbout.value = '';
+};
+
+// Сохраняем изменения
+const saveAbout = async () => {
+  try {
+    const aboutValue = localAbout.value.trim() || undefined;
+
+    // Отправляем все текущие значения из store + новое значение about
+    await editContributor({
+      about: aboutValue,
+      hours_per_day: contributorStore.self?.hours_per_day,
+      rate_per_hour: contributorStore.self?.rate_per_hour,
+    });
+
+    SuccessAlert('Информация о себе успешно обновлена');
+    isEditing.value = false;
+
+    // Уведомляем родительский компонент
+    emit('about-updated');
+  } catch (error) {
+    console.error('Ошибка при обновлении информации о себе:', error);
+    FailAlert(error, 'Не удалось обновить информацию о себе');
+  }
+};
+
+// Следим за изменениями в store и сбрасываем локальное состояние
+watch(() => contributorStore.self?.about, (newAbout) => {
+  if (!isEditing.value) {
+    localAbout.value = newAbout || '';
+  }
+}, { immediate: true });
+</script>

package/extensions/capital/features/Contributor/EditContributor/ui/EditHoursPerDayInput.vue

@@ -0,0 +1,120 @@
+<template lang="pug">
+ColorCard(color='blue')
+  .card-label Часов в день
+  template(v-if="!isEditing")
+    .card-value(:class="{ 'cursor-pointer': isOwnProfile }" @click="isOwnProfile ? startEditing() : null")
+      template(v-if="isOwnProfile")
+        q-icon(
+          name="edit"
+          size="16px"
+          color="grey-6"
+          style="margin-right: 8px;"
+        )
+      | {{ hasHours ? contributorStore.self?.hours_per_day : 'Не указано' }}
+  template(v-else)
+    .q-pa-sm
+      q-input(
+        v-model.number="localHours"
+        type="number"
+        label="Часов в день"
+        outlined
+        min="1"
+        max="8"
+        step="1"
+        :rules="[val => !val || (val >= 1 && val <= 8) || 'От 1 до 24 часов']"
+        dense
+      )
+      .row.q-gutter-sm.q-mt-sm.justify-end
+        q-btn(
+          flat
+          dense
+          label="Отмена"
+          color="grey-7"
+          @click="cancelEditing"
+        )
+        q-btn(
+          color="primary"
+          dense
+          label="Сохранить"
+          :loading="isSaving"
+          :disable="!hasChanges"
+          @click="saveHours"
+        )
+</template>
+
+<script setup lang="ts">
+import { ref, computed, watch } from 'vue';
+import { FailAlert, SuccessAlert } from 'src/shared/api';
+import { useEditContributor } from '../model';
+import { useContributorStore } from 'app/extensions/capital/entities/Contributor/model';
+import { useSessionStore } from 'src/entities/Session/model';
+import { ColorCard } from 'src/shared/ui';
+
+const emit = defineEmits<{
+  'hours-updated': [];
+}>();
+
+const contributorStore = useContributorStore();
+const { username } = useSessionStore();
+const { editContributor, isLoading } = useEditContributor();
+
+const isEditing = ref(false);
+const localHours = ref<number | undefined>();
+const isSaving = computed(() => isLoading.value);
+
+// Проверяем, является ли это профилем текущего пользователя
+const isOwnProfile = computed(() => {
+  return contributorStore.self?.username === username;
+});
+
+// Проверяем, есть ли информация о часах
+const hasHours = computed(() => {
+  return contributorStore.self?.hours_per_day && contributorStore.self.hours_per_day > 0;
+});
+
+// Проверяем, есть ли изменения
+const hasChanges = computed(() => {
+  const currentHours = contributorStore.self?.hours_per_day;
+  return localHours.value !== currentHours;
+});
+
+// Начинаем редактирование
+const startEditing = () => {
+  localHours.value = contributorStore.self?.hours_per_day;
+  isEditing.value = true;
+};
+
+// Отменяем редактирование
+const cancelEditing = () => {
+  isEditing.value = false;
+  localHours.value = undefined;
+};
+
+// Сохраняем изменения
+const saveHours = async () => {
+  try {
+    // Отправляем все текущие значения из store + новое значение hours_per_day
+    await editContributor({
+      about: contributorStore.self?.about,
+      hours_per_day: localHours.value,
+      rate_per_hour: contributorStore.self?.rate_per_hour,
+    });
+
+    SuccessAlert('Количество часов успешно обновлено');
+    isEditing.value = false;
+
+    // Уведомляем родительский компонент
+    emit('hours-updated');
+  } catch (error) {
+    console.error('Ошибка при обновлении количества часов:', error);
+    FailAlert(error, 'Не удалось обновить количество часов');
+  }
+};
+
+// Следим за изменениями в store и сбрасываем локальное состояние
+watch(() => contributorStore.self?.hours_per_day, (newHours) => {
+  if (!isEditing.value) {
+    localHours.value = newHours;
+  }
+}, { immediate: true });
+</script>