Merge branch 'develop' into staging-new

Author: BykhovDenis

models/process/src/index.ts

@@ -63,7 +63,6 @@ import {
   type Step,
   type Transition,
   type Trigger,
-  type TriggerResult,
   type UpdateCriteriaComponent,
   processId
 } from '@hcengineering/process'
@@ -136,8 +135,6 @@ export class TTransition extends TDoc implements Transition {
 
   triggerParams!: Record<string, any>
 
-  result?: TriggerResult | null
-
   @Prop(TypeRank(), core.string.Rank)
   @Hidden()
     rank!: Rank

packages/theme/styles/common.scss

@@ -906,3 +906,17 @@
 .emoji.fitSize > img {
   height: 1em;
 }
+
+.editor-grid {
+  display: grid;
+  grid-template-columns: 1fr 3fr;
+  grid-auto-rows: minmax(2rem, max-content);
+  justify-content: start;
+  align-items: center;
+  row-gap: 0.5rem;
+  margin: 0.25rem 2rem 0;
+  width: calc(100% - 4rem);
+  column-gap: 1rem;
+  margin-top: 0.5rem;
+  height: min-content;
+}

plugins/process-assets/lang/cs.json

@@ -99,7 +99,11 @@
     "Cancelled": "Zrušeno",
     "WaitUntil": "Čekat do",
     "CurrentUser": "Aktuální uživatel",
-    "CurrentDate": "Aktuální datum"
+    "CurrentDate": "Aktuální datum",
+    "AddResult": "Přidat výsledek",
+    "For": "Pro",
+    "Context": "Kontext",
+    "Attribute": "Atribut"
   },
   "error": {
     "MethodNotFound": "Metoda nenalezena: {methodId}",

plugins/process-assets/lang/de.json

@@ -99,7 +99,11 @@
     "Cancelled": "Abgebrochen",
     "WaitUntil": "Warten bis",
     "CurrentUser": "Aktueller Benutzer",
-    "CurrentDate": "Aktuelles Datum"
+    "CurrentDate": "Aktuelles Datum",
+    "AddResult": "Ergebnis hinzufügen",
+    "For": "Für",
+    "Context": "Kontext",
+    "Attribute": "Attribut"
   },
   "error": {
     "MethodNotFound": "Methode nicht gefunden: {methodId}",

plugins/process-assets/lang/en.json

@@ -104,7 +104,11 @@
     "Cancelled": "Cancelled",
     "WaitUntil": "Wait until",
     "CurrentUser": "Current user",
-    "CurrentDate": "Current date"
+    "CurrentDate": "Current date",
+    "AddResult": "Add result",
+    "For": "For",
+    "Context": "Context",
+    "Attribute": "Attribute"
   },
   "error": {
     "MethodNotFound": "Method not found: {methodId}",

plugins/process-assets/lang/es.json

@@ -104,7 +104,11 @@
     "Cancelled": "Cancelado",
     "WaitUntil": "Esperar hasta",
     "CurrentUser": "Usuario Actual",
-    "CurrentDate": "Fecha Actual"
+    "CurrentDate": "Fecha Actual",
+    "AddResult": "Agregar resultado",
+    "For": "Para",
+    "Context": "Contexto",
+    "Attribute": "Atributo"
   },
   "error": {
     "MethodNotFound": "Método no encontrado: {methodId}",

plugins/process-assets/lang/fr.json

@@ -104,7 +104,11 @@
     "Cancelled": "Annulé",
     "WaitUntil": "Attendre jusqu'à",
     "CurrentUser": "Utilisateur actuel",
-    "CurrentDate": "Date actuelle"
+    "CurrentDate": "Date actuelle",
+    "AddResult": "Ajouter un résultat",
+    "For": "Pour",
+    "Context": "Contexte",
+    "Attribute": "Attribut"
   },
   "error": {
     "MethodNotFound": "Méthode introuvable : {methodId}",

plugins/process-assets/lang/it.json

@@ -104,7 +104,11 @@
     "Cancelled": "Annullato",
     "WaitUntil": "Aspetta fino a",
     "CurrentUser": "Utente corrente",
-    "CurrentDate": "Data corrente"
+    "CurrentDate": "Data corrente",
+    "AddResult": "Aggiungi risultato",
+    "For": "Per",
+    "Context": "Contesto",
+    "Attribute": "Attributo"
   },
   "error": {
     "MethodNotFound": "Metodo non trovato: {methodId}",

plugins/process-assets/lang/ja.json

@@ -103,7 +103,11 @@
     "Cancelled": "キャンセル済み",
     "WaitUntil": "待機する",
     "CurrentUser": "現在のユーザー",
-    "CurrentDate": "現在の日付"
+    "CurrentDate": "現在の日付",
+    "AddResult": "結果を追加",
+    "For": "〜のために",
+    "Context": "コンテキスト",
+    "Attribute": "属性"
   },
   "error": {
     "MethodNotFound": "メソッドが見つかりません: {methodId}",

plugins/process-assets/lang/pt.json

@@ -104,7 +104,11 @@
     "Cancelled": "Cancelado",
     "WaitUntil": "Aguardar até",
     "CurrentUser": "Usuário Atual",
-    "CurrentDate": "Data Atual"
+    "CurrentDate": "Data Atual",
+    "AddResult": "Adicionar resultado",
+    "For": "Para",
+    "Attribute": "Atributo",
+    "Context": "Contexto"
   },
   "error": {
     "MethodNotFound": "Método não encontrado: {methodId}",