From 8b47263a10fc641a43cb827ed19be32eaf3a3606 Mon Sep 17 00:00:00 2001
From: Victor Ilyushchenko <alt13ri@gmail.com>
Date: Fri, 21 Feb 2025 13:33:03 +0300
Subject: [PATCH 1/3] Minor improvements for survey module (#8066)

* Minor improvements for survey module

Signed-off-by: Victor Ilyushchenko <alt13ri@gmail.com>

* ff

Signed-off-by: Victor Ilyushchenko <alt13ri@gmail.com>

---------

Signed-off-by: Victor Ilyushchenko <alt13ri@gmail.com>
---
 packages/theme/styles/editors.scss            |  37 ++++--
 packages/ui/src/components/EditBox.svelte     |  29 ++++-
 plugins/survey-assets/lang/en.json            |   3 +-
 plugins/survey-assets/lang/ru.json            |   3 +-
 .../src/components/EditPoll.svelte            |  10 +-
 .../src/components/EditPollPanel.svelte       |  72 ++++++-----
 .../src/components/EditQuestion.svelte        | 116 +++++++++++-------
 .../src/components/EditSurvey.svelte          |  44 +++----
 .../src/components/PollQuestion.svelte        |  26 ++--
 plugins/survey/src/index.ts                   |   3 +-
 10 files changed, 215 insertions(+), 128 deletions(-)

diff --git a/packages/theme/styles/editors.scss b/packages/theme/styles/editors.scss
index fff4d8a77f..e19972d887 100644
--- a/packages/theme/styles/editors.scss
+++ b/packages/theme/styles/editors.scss
@@ -19,7 +19,7 @@
   .underline {
     font-weight: 500;
 
-    input {
+    .antiEditBoxInput {
       padding: 0.25rem 0.5rem;
       background-color: var(--theme-editbox-focus-color);
       border-radius: 0.25rem;
@@ -43,7 +43,7 @@
     &:focus-within::after { content: ''; }
   }
 
-  input {
+  .antiEditBoxInput {
     margin: 0;
     padding: 0;
     min-width: 0;
@@ -86,7 +86,7 @@
     border-radius: .375rem;
     border: 1px solid transparent;
     
-    input {
+    .antiEditBoxInput {
       color: inherit;
 
       &::placeholder { color: var(--theme-darker-color); }
@@ -109,7 +109,7 @@
     font-weight: 500;
     font-size: 1.5rem;
 
-    input {
+    .antiEditBoxInput {
       font: inherit;
 
       &::placeholder {
@@ -119,17 +119,17 @@
     &:hover input:not(:focus)::placeholder {
       color: var(--input-hover-PlaceholderColor);
     }
-    input:focus::placeholder {
+    .antiEditBoxInput:focus::placeholder {
       color: var(--input-focus-PlaceholderColor);
     }
     &.disabled {
       box-shadow: inset 0 0 0 1px var(--input-BorderColor);
 
       &,
-      input {
+      .antiEditBoxInput {
         cursor: not-allowed;
       }
-      input::placeholder {
+      .antiEditBoxInput::placeholder {
         color: var(--input-PlaceholderColor);
       }
     }
@@ -139,4 +139,27 @@
     content: ' *';
     color: var(--theme-error-color);
   }
+
+  .antiEditBoxGridWrapper {
+    display: grid;
+    &::after {
+      content: attr(data-value) " ";
+      white-space: pre-wrap;
+      visibility: hidden;
+      z-index: -1;
+    }
+
+    textarea {
+      resize: none;
+    }
+
+    &::after, textarea {
+      font: inherit;
+      outline: none;
+      background-color: transparent;
+      overflow: hidden;
+      grid-area: 1 / 1 / 2 / 2;
+      min-height: 1.25rem;
+    }
+  }
 }
diff --git a/packages/ui/src/components/EditBox.svelte b/packages/ui/src/components/EditBox.svelte
index 7799919890..2f5690f735 100644
--- a/packages/ui/src/components/EditBox.svelte
+++ b/packages/ui/src/components/EditBox.svelte
@@ -29,7 +29,7 @@
   export let value: string | number | undefined = undefined
   export let placeholder: IntlString = plugin.string.EditBoxPlaceholder
   export let placeholderParam: any | undefined = undefined
-  export let format: 'text' | 'password' | 'number' = 'text'
+  export let format: 'text' | 'password' | 'number' | 'text-multiline' = 'text'
   export let maxDigitsAfterPoint: number | undefined = undefined
   export let kind: EditStyle = 'editbox'
   export let autoFocus: boolean = false
@@ -43,7 +43,7 @@
 
   const dispatch = createEventDispatcher()
 
-  let input: HTMLInputElement
+  let input: HTMLInputElement | HTMLTextAreaElement
   let phTranslate: string = ''
 
   $: {
@@ -135,8 +135,28 @@
     class:w-full={fullSize}
     style:width={maxWidth}
   >
-    {#if format === 'password'}
+    {#if format === 'text-multiline'}
+      <div class="antiEditBoxGridWrapper" data-value={value}>
+        <textarea
+          rows="1"
+          class="antiEditBoxInput"
+          {disabled}
+          style:width={maxWidth}
+          bind:this={input}
+          bind:value
+          placeholder={phTranslate}
+          on:input={handleInput}
+          on:change
+          on:keydown
+          on:keypress
+          on:blur={() => {
+            dispatch('blur', value)
+          }}
+        />
+      </div>
+    {:else if format === 'password'}
       <input
+        class="antiEditBoxInput"
         {disabled}
         style:width={maxWidth}
         id="userPassword"
@@ -154,11 +174,11 @@
       />
     {:else if format === 'number'}
       <input
+        class="antiEditBoxInput number"
         {disabled}
         style:width={maxWidth}
         bind:this={input}
         type="number"
-        class="number"
         bind:value
         placeholder={phTranslate}
         on:input={handleInput}
@@ -171,6 +191,7 @@
       />
     {:else}
       <input
+        class="antiEditBoxInput"
         {disabled}
         style:width={maxWidth}
         bind:this={input}
diff --git a/plugins/survey-assets/lang/en.json b/plugins/survey-assets/lang/en.json
index 1bd840ca02..8b682ca84d 100644
--- a/plugins/survey-assets/lang/en.json
+++ b/plugins/survey-assets/lang/en.json
@@ -43,6 +43,7 @@
     "SurveySubmitConfirm": "You will not be able to change answers after that. Are you sure you want to submit now?",
     "ValidateFail": "Some required questions are not answered",
     "ValidateInfo": "This is how the form will look like for an user. Try to type answers and select options to test your survey. A green icon in the header above shows the form is filled properly",
-    "ValidateOk": "Form is filled correctly"
+    "ValidateOk": "Form is filled correctly",
+    "EditAnswers": "Edit answers"
   }
 }
diff --git a/plugins/survey-assets/lang/ru.json b/plugins/survey-assets/lang/ru.json
index ba7663179d..65d23c9f81 100644
--- a/plugins/survey-assets/lang/ru.json
+++ b/plugins/survey-assets/lang/ru.json
@@ -43,6 +43,7 @@
     "SurveySubmitConfirm": "После этого вы больше не сможете изменять ответы. Вы уверены, что хотите завершить опрос сейчас?",
     "ValidateFail": "Нет ответов на некоторые обязательные вопросы",
     "ValidateInfo": "Так будет выглядеть форма для пользователя. Для проверки анкеты попробуйте вводить ответы и выбирать варианты. Зеленый значок в заголовке покажет, что форма заполнена правильно",
-    "ValidateOk": "Форма заполнена правильно"
+    "ValidateOk": "Форма заполнена правильно",
+    "EditAnswers": "Редактировать ответы"
   }
 }
diff --git a/plugins/survey-resources/src/components/EditPoll.svelte b/plugins/survey-resources/src/components/EditPoll.svelte
index a83cd47ffb..f225d162b9 100644
--- a/plugins/survey-resources/src/components/EditPoll.svelte
+++ b/plugins/survey-resources/src/components/EditPoll.svelte
@@ -60,7 +60,7 @@
   }
 </script>
 
-<div class="antiSection flex-gap-4">
+<div class="antiSection flex-gap-4 poll mb-8">
   {#if hasText(object.prompt)}
     <div class="antiSection-header">
       <span class="antiSection-header__title">
@@ -73,10 +73,16 @@
       <PollQuestion
         bind:this={questionNodes[index]}
         bind:isAnswered={isAnswered[index]}
-        readonly={readonly || object.isCompleted}
+        {readonly}
         on:answered={saveAnswers}
         {question}
       />
     {/if}
   {/each}
 </div>
+
+<style>
+  .poll {
+    user-select: text;
+  }
+</style>
diff --git a/plugins/survey-resources/src/components/EditPollPanel.svelte b/plugins/survey-resources/src/components/EditPollPanel.svelte
index 8cacdaa163..7e41322e0a 100644
--- a/plugins/survey-resources/src/components/EditPollPanel.svelte
+++ b/plugins/survey-resources/src/components/EditPollPanel.svelte
@@ -35,6 +35,10 @@
 
   let object: Poll | undefined = undefined
   let canSubmit = false
+  let requestUpdate = false
+
+  $: isCompleted = object?.isCompleted ?? false
+  $: editable = (!readonly && !isCompleted) || requestUpdate
 
   $: updateObject(_id)
 
@@ -48,19 +52,21 @@
     if (object === undefined) {
       return
     }
-    showPopup(
-      MessageBox,
-      {
-        label: survey.string.SurveySubmit,
-        message: survey.string.SurveySubmitConfirm
-      },
-      undefined,
-      async (result?: boolean) => {
-        if (result === true && object !== undefined) {
-          await getClient().updateDoc(object._class, object.space, object._id, { isCompleted: true })
-        }
-      }
-    )
+    requestUpdate = false
+    // showPopup(
+    //   MessageBox,
+    //   {
+    //     label: survey.string.SurveySubmit,
+    //     message: survey.string.SurveySubmitConfirm
+    //   },
+    //   undefined,
+    //   async (result?: boolean) => {
+    //     if (result === true && object !== undefined) {
+    //       await getClient().updateDoc(object._class, object.space, object._id, { isCompleted: true })
+    //     }
+    //   }
+    // )
+    await getClient().updateDoc(object._class, object.space, object._id, { isCompleted: true })
   }
 </script>
 
@@ -85,30 +91,36 @@
     </svelte:fragment>
 
     <svelte:fragment slot="utils">
-      {#if !readonly}
-        {#if !(object.isCompleted ?? false)}
-          <Button
-            icon={survey.icon.Submit}
-            label={survey.string.SurveySubmit}
-            kind={'primary'}
-            disabled={!canSubmit}
-            showTooltip={{ label: canSubmit ? undefined : survey.string.ValidateFail }}
-            on:click={submit}
-          />
-        {/if}
+      {#if editable}
         <Button
-          icon={IconMoreH}
-          iconProps={{ size: 'medium' }}
-          kind={'icon'}
-          on:click={(e) => {
-            showMenu(e, { object, excludedActions: [view.action.Open] })
+          icon={survey.icon.Submit}
+          label={survey.string.SurveySubmit}
+          kind={'primary'}
+          disabled={!canSubmit}
+          showTooltip={{ label: canSubmit ? undefined : survey.string.ValidateFail }}
+          on:click={submit}
+        />
+      {:else}
+        <Button
+          icon={view.icon.Edit}
+          label={survey.string.EditAnswers}
+          on:click={() => {
+            requestUpdate = true
           }}
         />
       {/if}
+      <Button
+        icon={IconMoreH}
+        iconProps={{ size: 'medium' }}
+        kind={'icon'}
+        on:click={(e) => {
+          showMenu(e, { object, excludedActions: [view.action.Open] })
+        }}
+      />
     </svelte:fragment>
 
     <div class="flex-col flex-grow flex-no-shrink">
-      <EditPoll {object} {readonly} bind:canSubmit />
+      <EditPoll {object} readonly={!editable} bind:canSubmit />
     </div>
   </Panel>
 {/if}
diff --git a/plugins/survey-resources/src/components/EditQuestion.svelte b/plugins/survey-resources/src/components/EditQuestion.svelte
index 1fc0cb5b55..a4e1b35d90 100644
--- a/plugins/survey-resources/src/components/EditQuestion.svelte
+++ b/plugins/survey-resources/src/components/EditQuestion.svelte
@@ -18,16 +18,16 @@
   import { MessageBox, getClient } from '@hcengineering/presentation'
   import { Question, QuestionKind, Survey } from '@hcengineering/survey'
   import {
+    ButtonIcon,
     EditBox,
     Icon,
     IconDelete,
     SelectPopup,
     eventToHTMLElement,
     showPopup,
-    tooltip,
-    ButtonIcon
+    tooltip
   } from '@hcengineering/ui'
-  import { createEventDispatcher } from 'svelte'
+  import { createEventDispatcher, onDestroy } from 'svelte'
   import survey from '../plugin'
 
   const client = getClient()
@@ -40,40 +40,65 @@
   let editQuestion: EditBox
   let hovered: boolean = false
 
-  $: question = parent?.questions?.[index] as Question
+  let defaultQuestion: Question = {
+    name: '',
+    kind: QuestionKind.STRING,
+    isMandatory: false,
+    hasCustomOption: false
+  }
+
+  $: question = (parent?.questions?.[index] as Question) ?? defaultQuestion
+  $: isNewQuestion = parent?.questions?.[index] === undefined
   $: options = question?.options ?? []
-  $: questionIcon =
-    question === undefined
-      ? survey.icon.Question
-      : question.kind === QuestionKind.OPTIONS
-        ? survey.icon.QuestionKindOptions
-        : question.kind === QuestionKind.OPTION
-          ? survey.icon.QuestionKindOption
-          : survey.icon.QuestionKindString
+  $: questionIcon = isNewQuestion
+    ? survey.icon.Question
+    : question.kind === QuestionKind.OPTIONS
+      ? survey.icon.QuestionKindOptions
+      : question.kind === QuestionKind.OPTION
+        ? survey.icon.QuestionKindOption
+        : survey.icon.QuestionKindString
+
+  let haveNameChanges = false
 
   let newOption = ''
-  let newQuestion = ''
+
+  onDestroy(() => {
+    handleExit()
+  })
+
+  function handleExit (): void {
+    void handleNameChange()
+  }
 
   async function updateParent (): Promise<void> {
     await client.updateDoc(parent._class, parent.space, parent._id, { questions: parent.questions })
   }
 
-  async function createQuestion (): Promise<void> {
+  $: if (isNewQuestion && question.name.trim() !== '') {
+    void createQuestion()
+  }
+
+  function createQuestion (): Promise<void> {
     if (parent.questions === undefined) {
       parent.questions = []
     }
-    parent.questions.push({
-      name: newQuestion,
-      kind: QuestionKind.STRING,
-      isMandatory: false,
-      hasCustomOption: false
-    })
-    await updateParent()
-    newQuestion = ''
+    parent.questions.push({ ...question })
+    defaultQuestion = { ...defaultQuestion, name: '' }
+    return updateParent()
+  }
+
+  function handleNameChange (): Promise<void> | void {
+    if (!haveNameChanges) return
+    haveNameChanges = false
+
+    if (isNewQuestion) return createQuestion()
+    return changeName()
   }
 
   async function changeName (): Promise<void> {
-    await updateParent()
+    if (!isNewQuestion) {
+      await updateParent()
+    }
   }
 
   async function changeKind (kind: QuestionKind): Promise<void> {
@@ -348,6 +373,7 @@
   }
 </script>
 
+<svelte:window on:beforeunload={handleExit} />
 <div
   bind:this={rootElement}
   class="question-container flex-col flex-gap-2"
@@ -357,27 +383,33 @@
   <!-- svelte-ignore a11y-click-events-have-key-events -->
   <!-- svelte-ignore a11y-no-static-element-interactions -->
   <div class="flex-row-center flex-gap-3 text-base pr-2" on:click={focusQuestion}>
-    {#if question === undefined}
-      <ButtonIcon size={'small'} disabled icon={survey.icon.Question} />
-      <EditBox
-        bind:this={editQuestion}
-        kind={'editbox'}
-        placeholder={survey.string.QuestionPlaceholder}
-        bind:value={newQuestion}
-        on:change={createQuestion}
-      />
+    {#if isNewQuestion}
+      <div class="self-start">
+        <ButtonIcon size={'small'} disabled icon={questionIcon} />
+      </div>
     {:else}
-      <div role="presentation" draggable={!readonly} on:dragstart={rootDragStart} on:dragend={rootDragEnd}>
+      <div
+        class="self-start"
+        role="presentation"
+        draggable={!readonly}
+        on:dragstart={rootDragStart}
+        on:dragend={rootDragEnd}
+      >
         <ButtonIcon size={'small'} disabled={readonly} icon={questionIcon} on:click={showQuestionParams} />
       </div>
-      <EditBox
-        bind:this={editQuestion}
-        kind={'editbox'}
-        disabled={readonly}
-        placeholder={survey.string.QuestionPlaceholderEmpty}
-        bind:value={question.name}
-        on:change={changeName}
-      />
+    {/if}
+    <EditBox
+      bind:this={editQuestion}
+      format={'text-multiline'}
+      disabled={readonly}
+      placeholder={survey.string.QuestionPlaceholderEmpty}
+      bind:value={question.name}
+      on:input={() => {
+        haveNameChanges = true
+      }}
+      on:change={handleNameChange}
+    />
+    {#if !isNewQuestion}
       {#if question.hasCustomOption && question.kind !== QuestionKind.STRING}
         <div class="flex-no-shrink" use:tooltip={{ label: survey.string.QuestionTooltipCustomOption }}>
           <Icon icon={survey.icon.QuestionHasCustomOption} size={'small'} />
@@ -390,7 +422,7 @@
       {/if}
     {/if}
   </div>
-  {#if question !== undefined && question.kind !== QuestionKind.STRING}
+  {#if !isNewQuestion && question.kind !== QuestionKind.STRING}
     {#each options as option, index (index)}
       <div
         class="flex-row-center flex-gap-3 option"
diff --git a/plugins/survey-resources/src/components/EditSurvey.svelte b/plugins/survey-resources/src/components/EditSurvey.svelte
index b1de506702..0a202f7a3c 100644
--- a/plugins/survey-resources/src/components/EditSurvey.svelte
+++ b/plugins/survey-resources/src/components/EditSurvey.svelte
@@ -29,6 +29,7 @@
   export let readonly: boolean = false
 
   $: questions = object?.questions ?? []
+  $: questionEditSlots = readonly ? questions : [...questions, {}]
 
   async function nameChange (): Promise<void> {
     await client.updateDoc(object._class, object.space, object._id, { name: object.name })
@@ -114,7 +115,7 @@
         <Label label={survey.string.Questions} />
       </span>
     </div>
-    {#each questions as question, index}
+    {#each questionEditSlots as question, index}
       <div
         role="listitem"
         on:dragover={(ev) => {
@@ -129,35 +130,22 @@
           draggedOverIndex !== draggedIndex &&
           draggedOverIndex !== draggedIndex + 1}
       >
-        <EditQuestion
-          {index}
-          {readonly}
-          parent={object}
-          on:dragStart={() => {
-            draggedIndex = index
-          }}
-          on:dragEnd={() => {
-            draggedIndex = undefined
-            draggedOverIndex = undefined
-          }}
-        />
+        {#key index}
+          <EditQuestion
+            {index}
+            {readonly}
+            parent={object}
+            on:dragStart={() => {
+              draggedIndex = index
+            }}
+            on:dragEnd={() => {
+              draggedIndex = undefined
+              draggedOverIndex = undefined
+            }}
+          />
+        {/key}
       </div>
     {/each}
-    {#if !readonly}
-      <div
-        role="listitem"
-        on:dragover={(ev) => {
-          dragOver(ev, questions.length)
-        }}
-        on:dragleave={(ev) => {
-          dragLeave(ev, questions.length)
-        }}
-        on:drop={dragDrop}
-        class:dragged-over={draggedOverIndex === questions.length && draggedIndex !== questions.length - 1}
-      >
-        <EditQuestion parent={object} index={-1} />
-      </div>
-    {/if}
   </div>
 {/if}
 
diff --git a/plugins/survey-resources/src/components/PollQuestion.svelte b/plugins/survey-resources/src/components/PollQuestion.svelte
index 6d65248f2a..292db22697 100644
--- a/plugins/survey-resources/src/components/PollQuestion.svelte
+++ b/plugins/survey-resources/src/components/PollQuestion.svelte
@@ -137,7 +137,7 @@
 
 <div class="question-answer-container flex-col flex-gap-3">
   <div class="flex-row-center flex-gap-1 flex-no-shrink">
-    <span class="text-lg caption-color font-medium">{question.name}</span>
+    <strong class="text-base caption-color font-medium pre-wrap">{question.name}</strong>
     {#if question.isMandatory && !readonly}
       <div
         class="flex-no-shrink"
@@ -151,9 +151,9 @@
   {#if readonly}
     {#each getReadonlyAnswers() as answer}
       {#if answer}
-        <div class="pl-6">{answer}</div>
+        <div class="pre-wrap">{answer}</div>
       {:else}
-        <div class="pl-6 content-halfcontent-color">
+        <div class="content-halfcontent-color">
           <Label label={survey.string.NoAnswer} />
         </div>
       {/if}
@@ -180,7 +180,6 @@
         {#if selectedOption === customOption}
           <div class="pl-6">
             <EditBox
-              kind={'ghost-large'}
               bind:value={answer}
               placeholder={survey.string.AnswerPlaceholder}
               focusable
@@ -206,7 +205,6 @@
         {#if selectedOptions[customOption]}
           <div class="pl-6">
             <EditBox
-              kind={'ghost-large'}
               bind:value={answer}
               placeholder={survey.string.AnswerPlaceholder}
               focusable
@@ -218,13 +216,14 @@
       {/if}
     </div>
   {:else}
-    <EditBox
-      kind={'ghost-large'}
-      bind:value={answer}
-      placeholder={survey.string.AnswerPlaceholder}
-      focusable
-      on:change={answerChange}
-    />
+    <div>
+      <EditBox
+        format={'text-multiline'}
+        bind:value={answer}
+        placeholder={survey.string.AnswerPlaceholder}
+        on:change={answerChange}
+      />
+    </div>
   {/if}
 </div>
 
@@ -233,4 +232,7 @@
     padding-top: var(--spacing-2);
     border-top: 1px solid var(--theme-divider-color);
   }
+  .pre-wrap {
+    white-space: pre-wrap;
+  }
 </style>
diff --git a/plugins/survey/src/index.ts b/plugins/survey/src/index.ts
index 791f679869..67f168e3a0 100644
--- a/plugins/survey/src/index.ts
+++ b/plugins/survey/src/index.ts
@@ -95,7 +95,8 @@ const survey = plugin(surveyId, {
     SurveySubmitConfirm: '' as IntlString,
     ValidateFail: '' as IntlString,
     ValidateInfo: '' as IntlString,
-    ValidateOk: '' as IntlString
+    ValidateOk: '' as IntlString,
+    EditAnswers: '' as IntlString
   },
   component: {
     CreateSurvey: '' as AnyComponent,

From 9ad349ba0f45837c0c22dc11a31f425e26040eb1 Mon Sep 17 00:00:00 2001
From: Denis Bykhov <bykhov.denis@gmail.com>
Date: Sat, 22 Feb 2025 00:54:03 +0500
Subject: [PATCH 2/3] Fix status order (#8070)

Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
---
 plugins/task-resources/src/index.ts    | 24 ++++++++++--------
 plugins/tracker-resources/src/utils.ts | 35 ++++++++++++++++++++------
 2 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/plugins/task-resources/src/index.ts b/plugins/task-resources/src/index.ts
index f3a8aac1b0..9e1bbb6d0d 100644
--- a/plugins/task-resources/src/index.ts
+++ b/plugins/task-resources/src/index.ts
@@ -227,11 +227,16 @@ export async function getAllStates (
   attr: Attribute<Status>,
   filterDone: boolean = true
 ): Promise<any[]> {
-  const typeId = get(selectedTypeStore)
+  const joinedProjectsTypes = get(typesOfJoinedProjectsStore) ?? []
+  const typeId = get(selectedTypeStore) ?? (joinedProjectsTypes.length === 1 ? joinedProjectsTypes[0] : undefined)
   const type = typeId !== undefined ? get(typeStore).get(typeId) : undefined
-  const taskTypeId = get(selectedTaskTypeStore)
+  const $taskType = get(taskTypeStore)
+  const joinedTaskTypes = Array.from($taskType.values()).filter((taskType) =>
+    joinedProjectsTypes.includes(taskType.parent)
+  )
+  const taskTypeId = get(selectedTaskTypeStore) ?? (joinedTaskTypes.length === 1 ? joinedTaskTypes[0]?._id : undefined)
   if (taskTypeId !== undefined) {
-    const taskType = get(taskTypeStore).get(taskTypeId)
+    const taskType = $taskType.get(taskTypeId)
     if (taskType === undefined) {
       return []
     }
@@ -284,17 +289,16 @@ export async function getAllStates (
       return statuses.map((p) => p?._id)
     }
   }
-  const joinedProjectsTypes = get(typesOfJoinedProjectsStore) ?? []
-  const includedStatuses = Array.from(get(taskTypeStore).values())
-    .filter((taskType) => joinedProjectsTypes.includes(taskType.parent))
-    .flatMap((taskType) => taskType.statuses)
-  const allStates = get(statusStore).array.filter((p) => p.ofAttribute === attr._id && includedStatuses.includes(p._id))
+  const includedStatuses = new Set(joinedTaskTypes.flatMap((taskType) => taskType.statuses))
+  const $statusStore = get(statusStore)
+  const allStates = [...includedStatuses].map((p) => $statusStore.byId.get(p))
+  const states = allStates.filter((p) => p !== undefined && p.ofAttribute === attr._id)
   if (filterDone) {
-    return allStates
+    return states
       .filter((p) => p?.category !== task.statusCategory.Lost && p?.category !== task.statusCategory.Won)
       .map((p) => p?._id)
   } else {
-    return allStates.map((p) => p?._id)
+    return states.map((p) => p?._id)
   }
 }
 
diff --git a/plugins/tracker-resources/src/utils.ts b/plugins/tracker-resources/src/utils.ts
index 69bdc5ca37..a70ccde380 100644
--- a/plugins/tracker-resources/src/utils.ts
+++ b/plugins/tracker-resources/src/utils.ts
@@ -37,8 +37,12 @@ import core, {
 } from '@hcengineering/core'
 import { type IntlString } from '@hcengineering/platform'
 import { createQuery, getClient, onClient } from '@hcengineering/presentation'
-import task, { getStatusIndex, makeRank, type ProjectType } from '@hcengineering/task'
-import { activeProjects as taskActiveProjects, taskTypeStore } from '@hcengineering/task-resources'
+import task, { getStatusIndex, makeRank, type TaskType, type ProjectType } from '@hcengineering/task'
+import {
+  activeProjects as taskActiveProjects,
+  taskTypeStore,
+  typesOfJoinedProjectsStore
+} from '@hcengineering/task-resources'
 import {
   IssuePriority,
   MilestoneStatus,
@@ -49,7 +53,7 @@ import {
   type Milestone,
   type Project
 } from '@hcengineering/tracker'
-import { PaletteColorIndexes, areDatesEqual, isWeekend } from '@hcengineering/ui'
+import { areDatesEqual, isWeekend, PaletteColorIndexes } from '@hcengineering/ui'
 import { type KeyFilter, type ViewletDescriptor } from '@hcengineering/view'
 import { CategoryQuery, ListSelectionProvider, statusStore, type SelectDirection } from '@hcengineering/view-resources'
 import { derived, get, writable } from 'svelte/store'
@@ -124,6 +128,16 @@ export const listIssueKanbanStatusOrder = [
   task.statusCategory.Lost
 ] as const
 
+function getTaskTypesStatusIndex (joinedTaskTypes: TaskType[], status: Ref<Status>): number {
+  for (const taskType of joinedTaskTypes) {
+    const indexx = taskType.statuses.indexOf(status)
+    if (indexx >= 0) {
+      return indexx
+    }
+  }
+  return -1
+}
+
 export async function issueStatusSort (
   client: TxOperations,
   value: Array<Ref<IssueStatus>>,
@@ -143,7 +157,12 @@ export async function issueStatusSort (
     )
     type = _space?.$lookup?.type
   }
+  const joinedProjectsTypes = get(typesOfJoinedProjectsStore) ?? []
   const taskTypes = get(taskTypeStore)
+  const joinedTaskTypes = Array.from(taskTypes.values()).filter(
+    (taskType) => joinedProjectsTypes.includes(taskType.parent) && taskType.ofClass === tracker.class.Issue
+  )
+
   const statuses = get(statusStore).byId
   // TODO: How we track category updates.
 
@@ -159,9 +178,10 @@ export async function issueStatusSort (
           const aIndex = getStatusIndex(type, taskTypes, a)
           const bIndex = getStatusIndex(type, taskTypes, b)
           return aIndex - bIndex
-        } else {
-          return (aVal?.name ?? '').localeCompare(bVal?.name ?? '')
         }
+        const aIndex = getTaskTypesStatusIndex(joinedTaskTypes, a)
+        const bIndex = getTaskTypesStatusIndex(joinedTaskTypes, b)
+        return aIndex - bIndex
       }
       return res
     })
@@ -177,9 +197,10 @@ export async function issueStatusSort (
           const aIndex = getStatusIndex(type, taskTypes, a)
           const bIndex = getStatusIndex(type, taskTypes, b)
           return aIndex - bIndex
-        } else if (aVal != null && bVal != null) {
-          return aVal.name.localeCompare(bVal.name)
         }
+        const aIndex = getTaskTypesStatusIndex(joinedTaskTypes, a)
+        const bIndex = getTaskTypesStatusIndex(joinedTaskTypes, b)
+        return aIndex - bIndex
       }
       return res
     })

From c6ff09bf2a56af0a36ce867a6f83353891e682e5 Mon Sep 17 00:00:00 2001
From: Renan Delfino <renandelfino@gmail.com>
Date: Sat, 22 Feb 2025 13:55:07 -0300
Subject: [PATCH 3/3] Portuguese translation for modules (#8073)

Signed-off-by: Renan Delfino <renandelfino@gmail.com>
---
 .../controlled-documents-assets/lang/pt.json  | 110 ++++++++++++++++++
 plugins/products-assets/lang/pt.json          |  39 +++++++
 plugins/survey-assets/lang/pt.json            |  48 ++++++++
 plugins/training-assets/lang/pt.json          | 103 ++++++++++++++++
 4 files changed, 300 insertions(+)
 create mode 100644 plugins/controlled-documents-assets/lang/pt.json
 create mode 100644 plugins/products-assets/lang/pt.json
 create mode 100644 plugins/survey-assets/lang/pt.json
 create mode 100644 plugins/training-assets/lang/pt.json

diff --git a/plugins/controlled-documents-assets/lang/pt.json b/plugins/controlled-documents-assets/lang/pt.json
new file mode 100644
index 0000000000..f229ec3679
--- /dev/null
+++ b/plugins/controlled-documents-assets/lang/pt.json
@@ -0,0 +1,110 @@
+{
+  "string": {
+    "ID": "ID",
+    "Code": "Código",
+    "Number": "Número",
+    "Category": "Categoria",
+    "CollaborativeDocument": "Documento colaborativo",
+    "ControlledDocument": "Documento controlado",
+    "Requests": "Solicitações",
+    "EffectiveDate": "Data de vigência",
+    "PlannedEffectiveDate": "Data de vigência planejada",
+    "Rank": "Classificação",
+    "DocumentRequest": "Solicitação de documento",
+    "DocumentReviewRequest": "Solicitação de revisão de documento",
+    "DocumentApprovalRequest": "Solicitação de aprovação de documento",
+    "ControlledStatus": "Status de controle",
+    "Categories": "Categorias",
+    "Guidance": "Orientação",
+    "Required": "Obrigatório",
+    "Description": "Descrição",
+    "Major": "Principal",
+    "Minor": "Secundária",
+    "Patch": "Correção",
+    "ValidationWorkflow": "Fluxo de validação",
+    "ChangeOwner": "Alterar responsável pelo documento",
+    "ChangeOwnerHintBeginning": "Transferir a propriedade do",
+    "ChangeOwnerHintEnd": "para outra pessoa.",
+    "ChangeOwnerWarning": "Você não poderá mais editar este documento após essa ação.",
+    "SelectOwner": "Selecionar novo responsável",
+    "CreateDocument": "Criar novo documento",
+    "CreateTemplate": "Criar novo modelo",
+    "Documents": "Documentos",
+    "Document": "Documento",
+    "NewDocumentDialogClose": "Deseja fechar este diálogo?",
+    "NewDocumentCloseNote": "Todas as alterações serão perdidas",
+    "Cancel": "Cancelar",
+    "EditorPlaceholder": "Digite para começar a editar...",
+    "Version": "Versão",
+    "TemplateVersion": "Versão do modelo",
+    "VersionValue": "v{major}.{minor}",
+    "SearchDocument": "Buscar documento...",
+    "CreateEnVersion": "Criar versão para revisão",
+    "Approvers": "Aprovadores",
+    "CoAuthors": "Coautores",
+    "Status": "Status",
+    "TemplateName": "Nome do modelo",
+    "DocumentApplication": "Documentos controlados",
+    "MyDocuments": "Meus documentos",
+    "Library": "Biblioteca",
+    "Labels": "Etiquetas",
+    "Author": "Autor",
+    "Review": "Revisão",
+    "Approval": "Aprovação",
+    "Reviewer": "Revisor",
+    "Approver": "Aprovador",
+    "DeleteCategory": "Excluir categoria?",
+    "DeleteCategoryHint": "Essa ação não pode ser desfeita",
+    "DeleteCategoryWarning": "A categoria não pode ser excluída porque está em uso",
+    "Latest": "Atual",
+    "Draft": "Rascunho",
+    "Reviewers": "Revisores",
+    "ViewMode": "Visualização",
+    "EditMode": "Edição",
+    "ComparisonMode": "Comparar",
+    "Compare": "Comparar:",
+    "Against": "Contra:",
+    "ComparisonModeNotSupported": "Modo de comparação não suportado.",
+    "CreateDraft": "Criar rascunho",
+    "SendForApproval": "Enviar para aprovação",
+    "SendForReview": "Enviar para revisão",
+    "CompleteReview": "Finalizar revisão",
+    "Approve": "Aprovar",
+    "Reject": "Rejeitar",
+    "ConfirmApproval": "Confirmar aprovação",
+    "ConfirmRejection": "Confirmar rejeição",
+    "ProvideRejectionReason": "Informe o motivo da rejeição...",
+    "RejectionReason": "Motivo da rejeição",
+    "ConfirmReviewCompletion": "Confirmar conclusão da revisão",
+    "ConfirmApprovalSubmission": "Confirmar envio para aprovação",
+    "ConfirmReviewSubmission": "Confirmar envio para revisão",
+    "AddApprovalTitle": "Envie seu documento para aprovação",
+    "AddApprovalDescription1": "Para que seu documento seja aprovado, ele deve atender a alguns requisitos:",
+    "AddApprovalDescription2": "deve estar no status 'Rascunho' ou 'Revisado'",
+    "AddApprovalDescription3": "não deve conter comentários não resolvidos",
+    "AddApprovalDescription4": "se houver treinamento planejado, ele deve estar no status 'Liberado'",
+    "NoApprovalsDescription": "Não há aprovações para esta versão do documento",
+    "CurrentVersion": "Versão atual",
+    "Obsolete": "Obsoleto",
+    "MakeDocumentObsolete": "Marcar como obsoleto",
+    "MakeDocumentObsoleteConfirm": "Tem certeza de que deseja marcar os seguintes documentos como obsoletos: {titles}?",
+    "ModificationDate": "Modificado em",
+    "Modified": "Modificado",
+    "Owner": "Responsável",
+    "AssignedTo": "Atribuído a",
+    "Unassigned": "Não atribuído",
+    "Title": "Título",
+    "CreateFolder": "Criar nova pasta",
+    "RenameFolder": "Renomear pasta",
+    "CreateChildFolder": "Criar subpasta"
+  },
+  "controlledDocStates": {
+    "Empty": "",
+    "Approved": "Aprovado",
+    "InApproval": "Em aprovação",
+    "InReview": "Em revisão",
+    "Reviewed": "Revisado",
+    "Rejected": "Rejeitado",
+    "ToReview": "A revisar"
+  }
+}
diff --git a/plugins/products-assets/lang/pt.json b/plugins/products-assets/lang/pt.json
new file mode 100644
index 0000000000..4e82b7a0d9
--- /dev/null
+++ b/plugins/products-assets/lang/pt.json
@@ -0,0 +1,39 @@
+{
+  "string": {
+    "Product": "Produto",
+    "Products": "Produtos",
+    "ProductsApplication": "Produtos",
+    "ProductNamePlaceholder": "Produto",
+    "ProductDescriptionPlaceholder": "Adicionar descrição...",
+    "ProductVersion": "Versão do produto",
+    "ProductVersions": "Versões do produto",
+    "ProductVersionDescriptionPlaceholder": "Adicionar descrição...",
+    "ProductVersionParent": "Versão principal",
+    "ProductVersionState": "Estado",
+    "SearchProduct": "Buscar produto...",
+    "CreateProduct": "Criar produto",
+    "CreateProductVersion": "Criar versão do produto",
+    "NoProductVersionParent": "Sem versão principal",
+    "NoProductVersions": "Sem versões do produto",
+    "CreateDialogClose": "Deseja fechar este diálogo?",
+    "CreateDialogCloseNote": "Todas as alterações serão perdidas",
+    "Description": "Descrição",
+    "Major": "Principal",
+    "Minor": "Secundária",
+    "Codename": "Codinome",
+    "ProductVersionStateActive": "Ativo",
+    "ProductVersionStateReleased": "Publicado",
+    "Icon": "Ícone",
+    "Color": "Cor",
+    "Private": "Privado",
+    "Public": "Público",
+    "Members": "Membros",
+    "RoleLabel": "Função: {role}",
+    "UpdateProductPermission": "Atualizar produto",
+    "UpdateProductDescription": "Concede aos usuários a capacidade de atualizar um produto",
+    "ChangeControl": "Controle de mudanças",
+    "ChangeSeverity": "Gravidade da mudança",
+    "ConfigLabel": "Produtos",
+    "ConfigDescription": "Extensão para gerenciar produtos"
+  }
+}
diff --git a/plugins/survey-assets/lang/pt.json b/plugins/survey-assets/lang/pt.json
new file mode 100644
index 0000000000..ebb23acc16
--- /dev/null
+++ b/plugins/survey-assets/lang/pt.json
@@ -0,0 +1,48 @@
+{
+  "string": {
+    "Answer": "Resposta",
+    "AnswerPlaceholder": "Digite sua resposta",
+    "AnswerCustomOption": "Opção personalizada",
+    "Application": "Pesquisa",
+    "Close": "Fechar",
+    "Control": "Controle",
+    "Completed": "Concluído",
+    "CreatePoll": "Criar uma pesquisa",
+    "CreateSurvey": "Pesquisa",
+    "DeleteOption": "Excluir opção",
+    "DeletePoll": "Excluir pesquisa",
+    "DeletePollConfirm": "Tem certeza de que deseja excluir a pesquisa?",
+    "DeleteQuestion": "Excluir pergunta",
+    "DeleteQuestionConfirm": "Tem certeza de que deseja excluir a pergunta?",
+    "Name": "Título",
+    "NoAnswer": "Sem resposta",
+    "NoName": "Sem título",
+    "NoPollsForDocument": "Não há pesquisas para isso",
+    "Poll": "Pesquisa",
+    "Polls": "Pesquisas",
+    "Prompt": "Descrição",
+    "PromptPlaceholder": "Incentive o usuário a responder algumas perguntas",
+    "Settings": "Configurações",
+    "Question": "Pergunta",
+    "Questions": "Perguntas",
+    "QuestionKindString": "Resposta simples",
+    "QuestionKindOption": "Selecionar uma opção",
+    "QuestionKindOptions": "Selecionar várias opções",
+    "QuestionIsMandatory": "É obrigatória",
+    "QuestionHasCustomOption": "Permite opção personalizada",
+    "QuestionPlaceholder": "Adicionar uma pergunta",
+    "QuestionPlaceholderEmpty": "Forneça o texto da pergunta",
+    "QuestionPlaceholderOption": "Adicionar uma opção",
+    "QuestionTooltipMandatory": "A resposta é obrigatória",
+    "QuestionTooltipCustomOption": "O usuário pode fornecer sua própria opção",
+    "Survey": "Formulário de Pesquisa",
+    "Surveys": "Formulários de Pesquisa",
+    "SurveyEdit": "Editar Formulário",
+    "SurveyPreview": "Visualizar Formulário",
+    "SurveySubmit": "Enviar",
+    "SurveySubmitConfirm": "Você não poderá alterar as respostas após o envio. Tem certeza de que deseja enviar agora?",
+    "ValidateFail": "Algumas perguntas obrigatórias não foram respondidas",
+    "ValidateInfo": "É assim que o formulário será exibido para um usuário. Tente digitar respostas e selecionar opções para testar sua pesquisa. Um ícone verde no cabeçalho acima indica que o formulário está preenchido corretamente",
+    "ValidateOk": "Formulário preenchido corretamente"
+  }
+}
diff --git a/plugins/training-assets/lang/pt.json b/plugins/training-assets/lang/pt.json
new file mode 100644
index 0000000000..bee6e73acb
--- /dev/null
+++ b/plugins/training-assets/lang/pt.json
@@ -0,0 +1,103 @@
+{
+  "string": {
+    "Active": "Ativo",
+    "All": "Todos",
+    "Canceled": "Cancelado",
+    "ChangeOwner": "Alterar proprietário",
+    "Completed": "Concluído",
+    "CreateNewVersion": "Criar nova versão",
+    "Duplicate": "Duplicar",
+    "IncomingRequestStateCanceled": "Cancelado",
+    "IncomingRequestStateDraft": "Rascunho",
+    "IncomingRequestStateFailed": "Falhou",
+    "IncomingRequestStatePassed": "Aprovado",
+    "IncomingRequestStatePending": "Pendente",
+    "NotSelected": "Não selecionado",
+    "Owner": "Proprietário",
+    "Permission_ChangeSomeoneElsesSentRequestOwner": "Alterar proprietário de uma solicitação de treinamento enviada por outra pessoa",
+    "Permission_ChangeSomeoneElsesSentRequestOwner_Description": "Concede aos usuários a capacidade de alterar o proprietário de uma solicitação de treinamento enviada por qualquer usuário",
+    "Permission_ChangeSomeoneElsesTrainingOwner": "Alterar proprietário de um treinamento de outra pessoa",
+    "Permission_ChangeSomeoneElsesTrainingOwner_Description": "Concede aos usuários a capacidade de alterar o proprietário de um treinamento de outra pessoa",
+    "Permission_CreateRequestOnSomeoneElsesTraining": "Atribuir um treinamento de outra pessoa",
+    "Permission_CreateRequestOnSomeoneElsesTraining_Description": "Concede aos usuários a capacidade de atribuir (criar solicitação para) um treinamento de outra pessoa",
+    "Permission_CreateTraining": "Criar treinamento",
+    "Permission_CreateTraining_Description": "Concede aos usuários a capacidade de criar um novo treinamento",
+    "Permission_ViewSomeoneElsesSentRequest": "Visualizar solicitação de treinamento enviada por outra pessoa",
+    "Permission_ViewSomeoneElsesSentRequest_Description": "Concede aos usuários a capacidade de visualizar uma solicitação de treinamento enviada por outra pessoa",
+    "Permission_ViewSomeoneElsesTraineesResults": "Visualizar resultados de uma solicitação de treinamento enviada por outra pessoa",
+    "Permission_ViewSomeoneElsesTraineesResults_Description": "Concede aos usuários a capacidade de visualizar os resultados de um treinamento enviado por outra pessoa",
+    "Permission_ViewSomeoneElsesTrainingOverview": "Visualizar treinamento de outra pessoa",
+    "Permission_ViewSomeoneElsesTrainingOverview_Description": "Concede aos usuários a capacidade de visualizar um treinamento de outra pessoa",
+    "Permission_ViewSomeoneElsesTrainingQuestions": "Visualizar perguntas de um treinamento de outra pessoa",
+    "Permission_ViewSomeoneElsesTrainingQuestions_Description": "Concede aos usuários a capacidade de visualizar perguntas de um treinamento de outra pessoa",
+    "Revision": "Revisão",
+    "SentYouATrainingRequest": "enviou uma solicitação de treinamento para você",
+    "State": "Status",
+    "Training": "Treinamento",
+    "TrainingApplication": "Treinamentos",
+    "TrainingAttempt": "Tentativa",
+    "TrainingAttemptAssessmentsPassed": "Avaliações Aprovadas",
+    "TrainingAttemptAssessmentsTotal": "Total de Avaliações",
+    "TrainingAttemptMyCurrentDraft": "Meu rascunho atual",
+    "TrainingAttemptMyLatestResult": "Meu último resultado",
+    "TrainingAttempts": "Tentativas",
+    "TrainingAttemptStateDraft": "Rascunho",
+    "TrainingAttemptStateFailed": "Reprovado",
+    "TrainingAttemptStatePassed": "Aprovado",
+    "TrainingAttemptSubmit": "Enviar",
+    "TrainingAttemptSubmittedBy": "Enviado por",
+    "TrainingAttemptSubmittedDate": "Data de envio",
+    "TrainingAuthor": "Autor",
+    "TrainingCreate": "Criar treinamento",
+    "TrainingCreated": "Treinamento criado",
+    "TrainingOverview": "Visão geral",
+    "TrainingPassingScore": "Nota mínima",
+    "TrainingPrefix": "Prefixo",
+    "TrainingQuestions": "Perguntas",
+    "TrainingRelease": "Publicação",
+    "TrainingReleasedBy": "Publicado por",
+    "TrainingReleasedOn": "Data de publicação",
+    "TrainingRequest": "Solicitação de treinamento",
+    "TrainingRequestAssign": "Atribuir solicitação",
+    "TrainingRequestAttempt": "Tentativa {index}/{total}",
+    "TrainingRequestCancel": "Cancelar solicitação",
+    "TrainingRequestCanceledBy": "Cancelado por",
+    "TrainingRequestCanceledDate": "Data do cancelamento",
+    "TrainingRequestCompletion": "Conclusão",
+    "TrainingRequestDueDate": "Data de vencimento",
+    "TrainingRequestMaxAttempts": "Máximo de tentativas",
+    "TrainingRequestNoDueDate": "Sem data de vencimento",
+    "TrainingRequestResults": "Resultados",
+    "TrainingRequestRoles": "Funções",
+    "TrainingRequestRolesCount": "{count, plural, one {# função} other {# funções}}",
+    "TrainingRequests": "Solicitações",
+    "TrainingRequestTrainee": "Treinando",
+    "TrainingRequestTrainees": "Treinandos",
+    "TrainingRetake": "Repetir",
+    "TrainingSeqNumber": "Número",
+    "TrainingStart": "Iniciar treinamento",
+    "TrainingStateArchived": "Arquivado",
+    "TrainingStateDeleted": "Excluído",
+    "TrainingStateDraft": "Rascunho",
+    "TrainingStateReleased": "Publicado",
+    "TrainingTake": "Realizar treinamento",
+    "TrainingTitle": "Título",
+    "Trainings": "Treinamentos",
+    "ViewAllTrainings": "Todos os treinamentos",
+    "ViewAllTrainingsAll": "Todos",
+    "ViewAllTrainingsArchived": "Arquivados",
+    "ViewAllTrainingsDrafts": "Rascunhos",
+    "ViewAllTrainingsReleased": "Publicados",
+    "ViewIncomingRequests": "Minhas solicitações",
+    "ViewMyResults": "Meus resultados",
+    "ViewMyTrainings": "Meus treinamentos",
+    "ViewMyTrainingsAll": "Todos",
+    "ViewMyTrainingsArchived": "Arquivados",
+    "ViewMyTrainingsDrafts": "Rascunhos",
+    "ViewMyTrainingsReleased": "Publicados",
+    "ViewSentRequests": "Solicitações dos treinandos",
+    "ViewTraineesResults": "Resultados dos treinandos",
+    "ConfigLabel": "Treinamentos",
+    "ConfigDescription": "Extensão para gerenciar treinamentos"
+  }
+}