diff --git a/.vscode/launch.json b/.vscode/launch.json index c13806bcbb..1c9af387f4 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -104,9 +104,12 @@ "UPLOAD_URL": "/files", "AI_BOT_URL": "http://localhost:4010", "STATS_URL": "http://huly.local:4900", - "QUEUE_CONFIG": "localhost:19092", + "QUEUE_CONFIG": "huly.local:19092", + "REGION": "cockroach", + "QUEUE_REGION": "cockroach", "FILES_URL": "http://huly.local:4030/blob/:workspace/:blobId/:filename", - "OTEL_EXPORTER_OTLP_ENDPOINT": "http://huly.local:4318/v1/traces" + "OTEL_EXPORTER_OTLP_ENDPOINT": "http://huly.local:4318/v1/traces", + "BRANDING_PATH": "${workspaceRoot}/dev/branding.json" }, "runtimeArgs": ["--nolazy", "-r", "ts-node/register"], "runtimeVersion": "20", @@ -972,25 +975,6 @@ "runtimeArgs": ["--nolazy", "-r", "ts-node/register"], "sourceMaps": true, "cwd": "${workspaceRoot}/services/export/pod-export" - }, - { - "name": "Msg2File", - "type": "node", - "request": "launch", - "args": ["src/index.ts"], - "env": { - "ACCOUNTS_URL": "http://localhost:3000", - "DB_URL": "postgresql://root@localhost:26257/defaultdb?sslmode=disable", - "PORT": "9087", - "SECRET": "secret", - "SERVICE_ID": "msg2file-service", - "STORAGE_CONFIG": "datalake|http://huly.local:4030" - }, - "runtimeVersion": "20", - "runtimeArgs": ["--nolazy", "-r", "ts-node/register"], - "sourceMaps": true, - "outputCapture": "std", - "cwd": "${workspaceRoot}/services/msg2file" } ] } diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 1e9b1f0b4b..68a6f5e10f 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -36,13 +36,13 @@ importers: version: 8.4.1 '@hocuspocus/provider': specifier: ^2.15.2 - version: 2.15.2(bufferutil@4.0.8)(utf-8-validate@6.0.4)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23) + version: 2.15.2(bufferutil@4.0.8)(utf-8-validate@6.0.4)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27) '@hocuspocus/server': specifier: ^2.15.2 - version: 2.15.2(bufferutil@4.0.8)(utf-8-validate@6.0.4)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23) + version: 2.15.2(bufferutil@4.0.8)(utf-8-validate@6.0.4)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27) '@hocuspocus/transformer': specifier: ^2.15.2 - version: 2.15.2(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7)(y-prosemirror@1.3.6(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23))(yjs@13.6.23) + version: 2.15.2(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7)(y-prosemirror@1.3.7(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27))(yjs@13.6.27) '@koa/cors': specifier: ^5.0.0 version: 5.0.0 @@ -267,7 +267,7 @@ importers: version: file:projects/collaboration.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.25.9)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3)) '@rush-temp/collaborator': specifier: file:./projects/collaborator.tgz - version: file:projects/collaborator.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@swc/core@1.13.5)(@tiptap/pm@2.11.7)(babel-jest@29.7.0(@babel/core@7.23.9))(bufferutil@4.0.8)(gcp-metadata@5.3.0(encoding@0.1.13))(snappy@7.2.2)(socks@2.8.3)(utf-8-validate@6.0.4)(y-prosemirror@1.3.6(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23))(y-protocols@1.0.6(yjs@13.6.23)) + version: file:projects/collaborator.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@swc/core@1.13.5)(@tiptap/pm@2.11.7)(babel-jest@29.7.0(@babel/core@7.23.9))(bufferutil@4.0.8)(gcp-metadata@5.3.0(encoding@0.1.13))(snappy@7.2.2)(socks@2.8.3)(utf-8-validate@6.0.4)(y-prosemirror@1.3.7(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27))(y-protocols@1.0.6(yjs@13.6.27)) '@rush-temp/collaborator-client': specifier: file:./projects/collaborator-client.tgz version: file:projects/collaborator-client.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3)) @@ -304,9 +304,6 @@ importers: '@rush-temp/communication-types': specifier: file:./projects/communication-types.tgz version: file:projects/communication-types.tgz(@types/node@22.15.29)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3)) - '@rush-temp/communication-yaml': - specifier: file:./projects/communication-yaml.tgz - version: file:projects/communication-yaml.tgz(@types/node@22.15.29)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3)) '@rush-temp/contact': specifier: file:./projects/contact.tgz version: file:projects/contact.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@22.15.29)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.25.9)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3)) @@ -912,7 +909,7 @@ importers: version: file:projects/pod-fulltext.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@swc/core@1.13.5)(babel-jest@29.7.0(@babel/core@7.23.9)) '@rush-temp/pod-github': specifier: file:./projects/pod-github.tgz - version: file:projects/pod-github.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@swc/core@1.13.5)(babel-jest@29.7.0(@babel/core@7.23.9))(bufferutil@4.0.8)(gcp-metadata@5.3.0(encoding@0.1.13))(snappy@7.2.2)(socks@2.8.3)(utf-8-validate@6.0.4)(y-prosemirror@1.3.6(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23)) + version: file:projects/pod-github.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@swc/core@1.13.5)(babel-jest@29.7.0(@babel/core@7.23.9))(bufferutil@4.0.8)(gcp-metadata@5.3.0(encoding@0.1.13))(snappy@7.2.2)(socks@2.8.3)(utf-8-validate@6.0.4)(y-prosemirror@1.3.7(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27)) '@rush-temp/pod-gmail': specifier: file:./projects/pod-gmail.tgz version: file:projects/pod-gmail.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@swc/core@1.13.5)(babel-jest@29.7.0(@babel/core@7.23.9))(bufferutil@4.0.8)(encoding@0.1.13)(utf-8-validate@6.0.4) @@ -928,9 +925,6 @@ importers: '@rush-temp/pod-media': specifier: file:./projects/pod-media.tgz version: file:projects/pod-media.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@swc/core@1.13.5)(babel-jest@29.7.0(@babel/core@7.23.9)) - '@rush-temp/pod-msg2file': - specifier: file:./projects/pod-msg2file.tgz - version: file:projects/pod-msg2file.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@swc/core@1.13.5)(babel-jest@29.7.0(@babel/core@7.23.9)) '@rush-temp/pod-notification': specifier: file:./projects/pod-notification.tgz version: file:projects/pod-notification.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@swc/core@1.13.5)(babel-jest@29.7.0(@babel/core@7.23.9)) @@ -1413,7 +1407,7 @@ importers: version: file:projects/text-markdown.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@22.15.29)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.25.9)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3)) '@rush-temp/text-ydoc': specifier: file:./projects/text-ydoc.tgz - version: file:projects/text-ydoc.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@22.15.29)(babel-jest@29.7.0(@babel/core@7.23.9))(bufferutil@4.0.8)(esbuild@0.25.9)(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3))(utf-8-validate@6.0.4)(y-protocols@1.0.6(yjs@13.6.23)) + version: file:projects/text-ydoc.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@22.15.29)(babel-jest@29.7.0(@babel/core@7.23.9))(bufferutil@4.0.8)(esbuild@0.25.9)(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3))(utf-8-validate@6.0.4)(y-protocols@1.0.6(yjs@13.6.27)) '@rush-temp/theme': specifier: file:./projects/theme.tgz version: file:projects/theme.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@22.15.29)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.25.9)(postcss-load-config@4.0.2(postcss@8.5.3)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3)))(postcss@8.5.3)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3)) @@ -1539,10 +1533,10 @@ importers: version: 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/extension-code-block@2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7)(highlight.js@11.11.1)(lowlight@3.3.0) '@tiptap/extension-collaboration': specifier: ^2.11.7 - version: 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7)(y-prosemirror@1.3.6(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23)) + version: 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7)(y-prosemirror@1.3.7(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27)) '@tiptap/extension-collaboration-cursor': specifier: ^2.11.7 - version: 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(y-prosemirror@1.3.6(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23)) + version: 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(y-prosemirror@1.3.7(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27)) '@tiptap/extension-document': specifier: ^2.11.7 version: 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7)) @@ -1732,9 +1726,6 @@ importers: '@types/node': specifier: ^22.15.29 version: 22.15.29 - '@types/node-cron': - specifier: ^3.0.11 - version: 3.0.11 '@types/nodemailer': specifier: ^6.4.17 version: 6.4.17 @@ -2032,6 +2023,9 @@ importers: graphql-binding: specifier: ^2.5.2 version: 2.5.2 + hash-it: + specifier: ^6.0.0 + version: 6.0.0 heic-decode: specifier: ^2.1.0 version: 2.1.0 @@ -2102,8 +2096,8 @@ importers: specifier: ~1.0.4 version: 1.0.5 lib0: - specifier: ^0.2.88 - version: 0.2.89 + specifier: ^0.2.109 + version: 0.2.114 libphonenumber-js: specifier: ^1.9.46 version: 1.10.56 @@ -2155,9 +2149,6 @@ importers: msgpackr-extract: specifier: ^3.0.3 version: 3.0.3 - node-cron: - specifier: ^3.0.3 - version: 3.0.3 node-forge: specifier: ^1.3.1 version: 1.3.1 @@ -2391,19 +2382,19 @@ importers: version: 8.18.2(bufferutil@4.0.8)(utf-8-validate@6.0.4) y-indexeddb: specifier: ^9.0.12 - version: 9.0.12(yjs@13.6.23) + version: 9.0.12(yjs@13.6.27) y-prosemirror: - specifier: ^1.3.6 - version: 1.3.6(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23) + specifier: ^1.3.7 + version: 1.3.7(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27) y-protocols: specifier: ^1.0.6 - version: 1.0.6(yjs@13.6.23) + version: 1.0.6(yjs@13.6.27) y-websocket: specifier: ^2.1.0 - version: 2.1.0(yjs@13.6.23) + version: 2.1.0(yjs@13.6.27) yjs: - specifier: ^13.6.23 - version: 13.6.23 + specifier: ^13.6.27 + version: 13.6.27 zod: specifier: ^3.22.4 version: 3.24.2 @@ -4564,7 +4555,7 @@ packages: version: 0.0.0 '@rush-temp/collaboration@file:projects/collaboration.tgz': - resolution: {integrity: sha512-aDcBIrPlESppS8EWtyzKhLJSC7IEHzPdLxtA05aZtp63v6+LRARuzfhT1x53KJ1u03/2ttjGu/ts7dVEnct2kw==, tarball: file:projects/collaboration.tgz} + resolution: {integrity: sha512-Ij/ksdlgcTdsHBU00nzKWoYkQNM0RMJdaPR1ZSmOMlKe9lndge3UT23w3G0KHXelXlkzBxKfKWPEfnAy1biedw==, tarball: file:projects/collaboration.tgz} version: 0.0.0 '@rush-temp/collaborator-client@file:projects/collaborator-client.tgz': @@ -4572,7 +4563,7 @@ packages: version: 0.0.0 '@rush-temp/collaborator@file:projects/collaborator.tgz': - resolution: {integrity: sha512-cGZGxft0YIkGzuUQIhYORUQ00fi/rhyhJnA0TMYMniRDfLLewBPvRtyXIHSHVZG1AJ1TWyyp+Xe+MrKfGYDzFw==, tarball: file:projects/collaborator.tgz} + resolution: {integrity: sha512-+WZ7aCQzJBE8eF+5MM4ruyqa73msf/U6AMvX598LOHy6WwTL/id/IXTSyult37VBTYpCa64I6BhD77gTV8D4Rw==, tarball: file:projects/collaborator.tgz} version: 0.0.0 '@rush-temp/communication-assets@file:projects/communication-assets.tgz': @@ -4580,7 +4571,7 @@ packages: version: 0.0.0 '@rush-temp/communication-client-query@file:projects/communication-client-query.tgz': - resolution: {integrity: sha512-6OA/sAql1ZLhhDX9J2yZOAEgfXqSxYh6yxpH/YGrC3PfYyhVAoe7piCjpB+JpKR5wL1kzpl1eP7Bj0IEq2jNJQ==, tarball: file:projects/communication-client-query.tgz} + resolution: {integrity: sha512-+68bXbpIU6XTujL5Dj3pFCdFelV7mE+Ln6zZEvf2NPHhAcJqy3+KjHQyIbytnWhCFsGyk+HE3S08ps6Kl6TKtw==, tarball: file:projects/communication-client-query.tgz} version: 0.0.0 '@rush-temp/communication-cockroach@file:projects/communication-cockroach.tgz': @@ -4588,7 +4579,7 @@ packages: version: 0.0.0 '@rush-temp/communication-query@file:projects/communication-query.tgz': - resolution: {integrity: sha512-sXcvSDoXmgZH233jFRePio23qQosvQZoACKqKgJ2Obr+oY4ZzJ2uX7DM0lyIKbhFUuLNFl56u2RfM5ra8SxRDg==, tarball: file:projects/communication-query.tgz} + resolution: {integrity: sha512-KMDSFpLNW1ekFoAf+BbRxPeRYnMUjYu+l80F+fgtvkKsX/6oKtb6xRhQyVh4EQiRlQBaMV//1b2d7cBwuF5HDw==, tarball: file:projects/communication-query.tgz} version: 0.0.0 '@rush-temp/communication-resources@file:projects/communication-resources.tgz': @@ -4604,21 +4595,17 @@ packages: version: 0.0.0 '@rush-temp/communication-server@file:projects/communication-server.tgz': - resolution: {integrity: sha512-KVc53phC1b9CNptvJmMb706t74gsCiEQGWvCpvTlRWMd3q+pj7i2994gJ0/KzuCojcHxPYVn2QxNojpNSV66Eg==, tarball: file:projects/communication-server.tgz} + resolution: {integrity: sha512-HfKzdbndaS3opK1inqcTOrVnKvU7PS2asLmKuR4JHooiTTvFFCHcXXYO++t1QmdGmankZRn3Qsq59CIt/UPgsA==, tarball: file:projects/communication-server.tgz} version: 0.0.0 '@rush-temp/communication-shared@file:projects/communication-shared.tgz': - resolution: {integrity: sha512-SustnNpr/eopCXmm0ZahvUZXZPcD7psSWM+CkWVwiPlLVPGWMVUURFOcnC94F3OhY+7qu9N0Rgr3gDvr4VKXWA==, tarball: file:projects/communication-shared.tgz} + resolution: {integrity: sha512-/ZUh5sviGQkQGJnOe6ImJHpKCcn7xNyyMeOcl4Tr3TqXjsH+uOQ0MAFI0Ul4f1LI+dGIrp1QsZWSVWvEVprRQQ==, tarball: file:projects/communication-shared.tgz} version: 0.0.0 '@rush-temp/communication-types@file:projects/communication-types.tgz': resolution: {integrity: sha512-uzZ82V1R+h+TmxBCrmKaAfUgoiX3Z8ciPGrkc42M++M5d5mlfIjTvPh0O+y50pHoFuQ5NQ3pNIjeDkrJE8Dp0w==, tarball: file:projects/communication-types.tgz} version: 0.0.0 - '@rush-temp/communication-yaml@file:projects/communication-yaml.tgz': - resolution: {integrity: sha512-D+fijwXQM2oMeT6QOmkRVLik5uyVCNsml07rz5RvKcPEpbqRh3YBtIvcUABoCStLvNTIzYuXnqbCHzSl/ibidw==, tarball: file:projects/communication-yaml.tgz} - version: 0.0.0 - '@rush-temp/communication@file:projects/communication.tgz': resolution: {integrity: sha512-kO/x+NBE4Nmtz5KhHO0kxty/0N1A2PH4dNVTdOviEV4mVAhFm7DkgWHu0SwWJvQrCzsB0xEga3/CGuGjcPyMjA==, tarball: file:projects/communication.tgz} version: 0.0.0 @@ -4684,7 +4671,7 @@ packages: version: 0.0.0 '@rush-temp/desktop@file:projects/desktop.tgz': - resolution: {integrity: sha512-kMVLNqalurSBKidY00TqK2GIBSaEvgAKScF/32N4vsmx+pzMBkE6U63HiW+RxsqVC/ig9QikeohoDXx7Ps9kHg==, tarball: file:projects/desktop.tgz} + resolution: {integrity: sha512-EIuP2KmLDWhA4J63srKU8MI9wWCUTpNtCPGaS9P4guXJdH55cV8cqbWYbEYuWqsa28YPPoS1hel73H92Mf7nKw==, tarball: file:projects/desktop.tgz} version: 0.0.0 '@rush-temp/devmodel-resources@file:projects/devmodel-resources.tgz': @@ -4912,7 +4899,7 @@ packages: version: 0.0.0 '@rush-temp/love-resources@file:projects/love-resources.tgz': - resolution: {integrity: sha512-uB1RrbistrQwA5PIld+dgw+QnpTtS5i6wdiSAemCBe2ay5hTKExnmINPrgM/p7FEkya2sq3IVZXzric/ZYwnng==, tarball: file:projects/love-resources.tgz} + resolution: {integrity: sha512-d/rTH5piCl8x3YfKoZ2yIWklH/MU9h8WrccgwV9VS3a1lYQ2i6l+JVpO/hdMGTN6llF3REFNnMYndfcu8Siy4w==, tarball: file:projects/love-resources.tgz} version: 0.0.0 '@rush-temp/love@file:projects/love.tgz': @@ -4976,7 +4963,7 @@ packages: version: 0.0.0 '@rush-temp/model-all@file:projects/model-all.tgz': - resolution: {integrity: sha512-u5b+jP4WxAVIk6DlawxySE+qDG7iz7YD3dTT3LCgR3Ml5RkMOlej4YtbO0YQmX4wp4l4gMJKdRCgBCpVfytksg==, tarball: file:projects/model-all.tgz} + resolution: {integrity: sha512-1IC5c/j2fgqgamtZGZLUBHUuzMaqM6eguG6WTbmdTrSW8YjfUYeutKSRDRykbF6SilzaGS8eKxhNpZTIRT20fA==, tarball: file:projects/model-all.tgz} version: 0.0.0 '@rush-temp/model-analytics-collector@file:projects/model-analytics-collector.tgz': @@ -5424,7 +5411,7 @@ packages: version: 0.0.0 '@rush-temp/pod-fulltext@file:projects/pod-fulltext.tgz': - resolution: {integrity: sha512-0G3FKVxHWnyPuHWVBiR3Xtns3rLxGTC6ferQCX8NSC3dGOGOvk4TZgB8leohmJavwwxdZQKk1QFJqmXvHux10A==, tarball: file:projects/pod-fulltext.tgz} + resolution: {integrity: sha512-kPi4ermTxQtUKZ5xzbJgT07rLj2gG6m4YQgArWiONz47ooSoizi/Sg8Pu2FFyVV0klzQwqUOseuoVqgdySnFNg==, tarball: file:projects/pod-fulltext.tgz} version: 0.0.0 '@rush-temp/pod-github@file:projects/pod-github.tgz': @@ -5451,10 +5438,6 @@ packages: resolution: {integrity: sha512-5LRHcx/zPNVCJbIBfjigt+of64jfGrH5fjoDyvhASTEJbtG4RGRj8kKZoUI+1JHibDZzcVn2NLc+3nFMhksreA==, tarball: file:projects/pod-media.tgz} version: 0.0.0 - '@rush-temp/pod-msg2file@file:projects/pod-msg2file.tgz': - resolution: {integrity: sha512-7b2GrlsmevpahNIADhqNUBpshocrdjlc2L0kf2BAFVSEFpjzUtRju2XqwwoZ2l7xA0Z/b+Un9PHt+XYMWcNzlg==, tarball: file:projects/pod-msg2file.tgz} - version: 0.0.0 - '@rush-temp/pod-notification@file:projects/pod-notification.tgz': resolution: {integrity: sha512-1EeImD9ZNRxWq0jDp6o50hOpuoB0sNI54V/V1pm5VONdRF0S2lVzPCr35YehJ5BJcvbhy22au/7rk9XadoYI9w==, tarball: file:projects/pod-notification.tgz} version: 0.0.0 @@ -5524,7 +5507,7 @@ packages: version: 0.0.0 '@rush-temp/presentation@file:projects/presentation.tgz': - resolution: {integrity: sha512-nMn7FUSF2F6YuJAstYbvV8Yi9upkKqeSccsU3EOrKjJm1c57sa7x8i4K3Z6l4RoSQk86/F5CrzZVgqIMKCjF0w==, tarball: file:projects/presentation.tgz} + resolution: {integrity: sha512-r1AG89qg5hvx+usQjP8KLtkNL/j5z/8OHDcURyAb6yOhWAWNkY5Frs05L9qcPsJoN6raUaZ164jzlk0P2SiPqQ==, tarball: file:projects/presentation.tgz} version: 0.0.0 '@rush-temp/print-assets@file:projects/print-assets.tgz': @@ -5552,7 +5535,7 @@ packages: version: 0.0.0 '@rush-temp/prod@file:projects/prod.tgz': - resolution: {integrity: sha512-OvmMqiOyuDeKVGHc7g8UxMlvr9WAJsqtqICsv6kcx9vSvB7bB0iXOLY9CevyOOBDk5Y6OvRKWJKeY9pif+pjMg==, tarball: file:projects/prod.tgz} + resolution: {integrity: sha512-LkECK91CfEPLwDVaCQWN4XSeBlM1jXqboKuXtu7ftZkgG66wtt1/AlVDqwRY6o1iuvVNvuTJBSp03DMfDzBIKw==, tarball: file:projects/prod.tgz} version: 0.0.0 '@rush-temp/products-assets@file:projects/products-assets.tgz': @@ -5804,7 +5787,7 @@ packages: version: 0.0.0 '@rush-temp/server-indexer@file:projects/server-indexer.tgz': - resolution: {integrity: sha512-OYx2FWCD6jtTnsKmYnhhS3BsvhtCN9pIYkvIoSe0mzZi3xEAhnwu2T59+JpZgRO1fvD1yVxBy7nw0hyFtz03Hg==, tarball: file:projects/server-indexer.tgz} + resolution: {integrity: sha512-InjSApXF2jmClorioQIIV+JxbKtuYjl3a9i4eetEWuG2z7R+Ya7L6f98cqhEhYkdA4hM5TTZYbS+BcRLWlSqQg==, tarball: file:projects/server-indexer.tgz} version: 0.0.0 '@rush-temp/server-inventory-resources@file:projects/server-inventory-resources.tgz': @@ -6068,7 +6051,7 @@ packages: version: 0.0.0 '@rush-temp/text-core@file:projects/text-core.tgz': - resolution: {integrity: sha512-WezIZjq0OzkKSAy6wMqDFrvEsZ0HlLXzmctJ8w/io4+ywOUO2Cb9ZDXn80wwr5t3TFdb2rvfg1lMM5xDuC+RfA==, tarball: file:projects/text-core.tgz} + resolution: {integrity: sha512-wSRif2622acwkDHy2FtsEDhnDTsl8hydf/MFYSgAri0l5sQ6qOPHLuh8FZ2yf81EWTLfK/iuez70cAlYwkypMw==, tarball: file:projects/text-core.tgz} version: 0.0.0 '@rush-temp/text-editor-assets@file:projects/text-editor-assets.tgz': @@ -6076,7 +6059,7 @@ packages: version: 0.0.0 '@rush-temp/text-editor-resources@file:projects/text-editor-resources.tgz': - resolution: {integrity: sha512-vb8UXE1DL6LyA3M51Pj4uKcuxdoaPEYFcNa/P7i0zR8XsebrOJZWNAhvtIsH1NKmNycLBNhvmTxKKEM1XEaiLA==, tarball: file:projects/text-editor-resources.tgz} + resolution: {integrity: sha512-2aRRXC4H573M3+OR/vRe5pGoA4tAB3jEbufqAe4/EgKkUHvRlGVZBBUyDAfYtsIHQd7IrAEEVK1NQoC6iZE1Lg==, tarball: file:projects/text-editor-resources.tgz} version: 0.0.0 '@rush-temp/text-editor@file:projects/text-editor.tgz': @@ -6092,7 +6075,7 @@ packages: version: 0.0.0 '@rush-temp/text-ydoc@file:projects/text-ydoc.tgz': - resolution: {integrity: sha512-vKLzX1+/6aZmMzsR213dQDXADDE4cDw3M2Ofkn3r7QKV6GidHGHipTlBO4jjsCbYK4G0L1QIf8ZHi7QhpE8icQ==, tarball: file:projects/text-ydoc.tgz} + resolution: {integrity: sha512-EdNN9bQUsIb2qPGpotFbm5xIQDH1GJilcCiV66EVTlrsRkQSAjqVDPZyhQALE8200gR8K7OCSayKoQPnb/nPEA==, tarball: file:projects/text-ydoc.tgz} version: 0.0.0 '@rush-temp/text@file:projects/text.tgz': @@ -6116,7 +6099,7 @@ packages: version: 0.0.0 '@rush-temp/tool@file:projects/tool.tgz': - resolution: {integrity: sha512-bsqWzFX5qr02kfG1zQZOgHsGWzR/Z66VC16ZoQnXs6mkdHFSmQ2p2l8eNL/aYPu2qfrRkMNAnI8cu6aULfKuDg==, tarball: file:projects/tool.tgz} + resolution: {integrity: sha512-FwR6SJSyoZvzT/0uIoItaG+S6N+ofaqtNJ4ZXRJ8f454jzOGrzjgjL+BupOX+xJCY4w9zNfpMOIke7e9LPX5pA==, tarball: file:projects/tool.tgz} version: 0.0.0 '@rush-temp/tracker-assets@file:projects/tracker-assets.tgz': @@ -7176,9 +7159,6 @@ packages: '@types/mysql@2.15.27': resolution: {integrity: sha512-YfWiV16IY0OeBfBCk8+hXKmdTKrKlwKN1MNKAPBu5JYxLwBEZl7QzeEpGnlZb3VMGJrrGmB84gXiH+ofs/TezA==} - '@types/node-cron@3.0.11': - resolution: {integrity: sha512-0ikrnug3/IyneSHqCBeslAhlK2aBfYek1fGo4bP4QnZPmiqSGRK+Oy7ZMisLWkesffJvQ1cqAcBnJC+8+nxIAg==} - '@types/node-fetch@2.6.12': resolution: {integrity: sha512-8nneRWKCg3rMtF69nLQJnOYUcbafYeFSjqkw3jCRLsqkWFlHaoQrr5mXmofFGOx3DKn7UfmBMyov8ySvLRVldA==} @@ -10177,6 +10157,9 @@ packages: has-unicode@2.0.1: resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==} + hash-it@6.0.0: + resolution: {integrity: sha512-KHzmSFx1KwyMPw0kXeeUD752q/Kfbzhy6dAZrjXV9kAIXGqzGvv8vhkUqj+2MGZldTo0IBpw6v7iWE7uxsvH0w==} + hasown@2.0.1: resolution: {integrity: sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==} engines: {node: '>= 0.4'} @@ -11170,18 +11153,8 @@ packages: lexorank@1.0.5: resolution: {integrity: sha512-K1B/Yr/gIU0wm68hk/yB0p/mv6xM3ShD5aci42vOwcjof8slG8Kpo3Q7+1WTv7DaRHKWRgLPqrFDt+4GtuFAtA==} - lib0@0.2.109: - resolution: {integrity: sha512-jP0gbnyW0kwlx1Atc4dcHkBbrVAkdHjuyHxtClUPYla7qCmwIif1qZ6vQeJdR5FrOVdn26HvQT0ko01rgW7/Xw==} - engines: {node: '>=16'} - hasBin: true - - lib0@0.2.89: - resolution: {integrity: sha512-5j19vcCjsQhvLG6mcDD+nprtJUCbmqLz5Hzt5xgi9SV6RIW/Dty7ZkVZHGBuPOADMKjQuKDvuQTH495wsmw8DQ==} - engines: {node: '>=16'} - hasBin: true - - lib0@0.2.99: - resolution: {integrity: sha512-vwztYuUf1uf/1zQxfzRfO5yzfNKhTtgOByCruuiQQxWQXnPb8Itaube5ylofcV0oM0aKal9Mv+S1s1Ky0UYP1w==} + lib0@0.2.114: + resolution: {integrity: sha512-gcxmNFzA4hv8UYi8j43uPlQ7CGcyMJ2KQb5kZASw6SnAKAf10hK12i2fjrS3Cl/ugZa5Ui6WwIu1/6MIXiHttQ==} engines: {node: '>=16'} hasBin: true @@ -11808,10 +11781,6 @@ packages: node-api-version@0.2.0: resolution: {integrity: sha512-fthTTsi8CxaBXMaBAD7ST2uylwvsnYxh2PfaScwpMhos6KlSFajXQPcM4ogNE1q2s3Lbz9GCGqeIHC+C6OZnKg==} - node-cron@3.0.3: - resolution: {integrity: sha512-dOal67//nohNgYWb+nWmg5dkFdIwDm8EpeGYMekPMrngV3637lqnX0lbUcCtgibHTz6SEz7DAIjKvKDFYCnO1A==} - engines: {node: '>=6.0.0'} - node-domexception@1.0.0: resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==} engines: {node: '>=10.5.0'} @@ -14469,8 +14438,8 @@ packages: peerDependencies: yjs: ^13.0.0 - y-prosemirror@1.3.6: - resolution: {integrity: sha512-vtS2rv8+ll/TBQRqwUiqflgSuN/DhfvUQX0r5O3o5i0pO6K4pSNgFtVkOKtNWPBVkS6l9BDQjbtnDNftZnxq7Q==} + y-prosemirror@1.3.7: + resolution: {integrity: sha512-NpM99WSdD4Fx4if5xOMDpPtU3oAmTSjlzh5U4353ABbRHl1HtAFUx6HlebLZfyFxXN9jzKMDkVbcRjqOZVkYQg==} engines: {node: '>=16.0.0', npm: '>=8.0.0'} peerDependencies: prosemirror-model: ^1.7.1 @@ -14538,8 +14507,8 @@ packages: yauzl@2.10.0: resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==} - yjs@13.6.23: - resolution: {integrity: sha512-ExtnT5WIOVpkL56bhLeisG/N5c4fmzKn4k0ROVfJa5TY2QHbH7F0Wu2T5ZhR7ErsFWQEFafyrnSI8TPKVF9Few==} + yjs@13.6.27: + resolution: {integrity: sha512-OIDwaflOaq4wC6YlPBy2L6ceKeKuF7DeTxx+jPzv1FHn9tCZ0ZwSRnUBxD05E3yed46fv/FWJbvR+Ud7x0L7zw==} engines: {node: '>=16.0.0', npm: '>=8.0.0'} ylru@1.3.2: @@ -15620,41 +15589,41 @@ snapshots: '@hocuspocus/common@2.15.2': dependencies: - lib0: 0.2.99 + lib0: 0.2.114 - '@hocuspocus/provider@2.15.2(bufferutil@4.0.8)(utf-8-validate@6.0.4)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23)': + '@hocuspocus/provider@2.15.2(bufferutil@4.0.8)(utf-8-validate@6.0.4)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27)': dependencies: '@hocuspocus/common': 2.15.2 '@lifeomic/attempt': 3.0.3 - lib0: 0.2.99 + lib0: 0.2.114 ws: 8.18.2(bufferutil@4.0.8)(utf-8-validate@6.0.4) - y-protocols: 1.0.6(yjs@13.6.23) - yjs: 13.6.23 + y-protocols: 1.0.6(yjs@13.6.27) + yjs: 13.6.27 transitivePeerDependencies: - bufferutil - utf-8-validate - '@hocuspocus/server@2.15.2(bufferutil@4.0.8)(utf-8-validate@6.0.4)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23)': + '@hocuspocus/server@2.15.2(bufferutil@4.0.8)(utf-8-validate@6.0.4)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27)': dependencies: '@hocuspocus/common': 2.15.2 async-lock: 1.4.1 kleur: 4.1.5 - lib0: 0.2.99 + lib0: 0.2.114 uuid: 11.1.0 ws: 8.18.2(bufferutil@4.0.8)(utf-8-validate@6.0.4) - y-protocols: 1.0.6(yjs@13.6.23) - yjs: 13.6.23 + y-protocols: 1.0.6(yjs@13.6.27) + yjs: 13.6.27 transitivePeerDependencies: - bufferutil - utf-8-validate - '@hocuspocus/transformer@2.15.2(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7)(y-prosemirror@1.3.6(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23))(yjs@13.6.23)': + '@hocuspocus/transformer@2.15.2(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7)(y-prosemirror@1.3.7(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27))(yjs@13.6.27)': dependencies: '@tiptap/core': 2.11.7(@tiptap/pm@2.11.7) '@tiptap/pm': 2.11.7 '@tiptap/starter-kit': 2.11.7 - y-prosemirror: 1.3.6(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23) - yjs: 13.6.23 + y-prosemirror: 1.3.7(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27) + yjs: 13.6.27 '@humanwhocodes/config-array@0.11.14': dependencies: @@ -18947,7 +18916,7 @@ snapshots: prettier: 3.2.5 ts-jest: 29.1.2(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.25.9)(jest@29.7.0(@types/node@22.15.29)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3)))(typescript@5.8.3) typescript: 5.8.3 - yjs: 13.6.23 + yjs: 13.6.27 transitivePeerDependencies: - '@babel/core' - '@jest/types' @@ -18984,10 +18953,10 @@ snapshots: - supports-color - ts-node - '@rush-temp/collaborator@file:projects/collaborator.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@swc/core@1.13.5)(@tiptap/pm@2.11.7)(babel-jest@29.7.0(@babel/core@7.23.9))(bufferutil@4.0.8)(gcp-metadata@5.3.0(encoding@0.1.13))(snappy@7.2.2)(socks@2.8.3)(utf-8-validate@6.0.4)(y-prosemirror@1.3.6(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23))(y-protocols@1.0.6(yjs@13.6.23))': + '@rush-temp/collaborator@file:projects/collaborator.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@swc/core@1.13.5)(@tiptap/pm@2.11.7)(babel-jest@29.7.0(@babel/core@7.23.9))(bufferutil@4.0.8)(gcp-metadata@5.3.0(encoding@0.1.13))(snappy@7.2.2)(socks@2.8.3)(utf-8-validate@6.0.4)(y-prosemirror@1.3.7(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27))(y-protocols@1.0.6(yjs@13.6.27))': dependencies: - '@hocuspocus/server': 2.15.2(bufferutil@4.0.8)(utf-8-validate@6.0.4)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23) - '@hocuspocus/transformer': 2.15.2(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7)(y-prosemirror@1.3.6(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23))(yjs@13.6.23) + '@hocuspocus/server': 2.15.2(bufferutil@4.0.8)(utf-8-validate@6.0.4)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27) + '@hocuspocus/transformer': 2.15.2(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7)(y-prosemirror@1.3.7(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27))(yjs@13.6.27) '@tiptap/core': 2.11.7(@tiptap/pm@2.11.7) '@tiptap/html': 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7) '@types/body-parser': 1.19.5 @@ -19016,7 +18985,7 @@ snapshots: ts-node: 10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3) typescript: 5.8.3 ws: 8.18.2(bufferutil@4.0.8)(utf-8-validate@6.0.4) - yjs: 13.6.23 + yjs: 13.6.27 transitivePeerDependencies: - '@aws-sdk/credential-providers' - '@babel/core' @@ -19286,29 +19255,6 @@ snapshots: - supports-color - ts-node - '@rush-temp/communication-yaml@file:projects/communication-yaml.tgz(@types/node@22.15.29)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3))': - dependencies: - '@types/js-yaml': 4.0.9 - '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.8.3))(eslint@8.56.0)(typescript@5.8.3) - '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.8.3) - esbuild: 0.25.9 - esbuild-plugin-copy: 2.1.1(esbuild@0.25.9) - eslint: 8.56.0 - eslint-config-standard-with-typescript: 40.0.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.8.3))(eslint@8.56.0)(typescript@5.8.3))(eslint-plugin-import@2.29.1(eslint@8.56.0))(eslint-plugin-n@15.7.0(eslint@8.56.0))(eslint-plugin-promise@6.1.1(eslint@8.56.0))(eslint@8.56.0)(typescript@5.8.3) - eslint-plugin-import: 2.29.1(eslint@8.56.0) - eslint-plugin-n: 15.7.0(eslint@8.56.0) - eslint-plugin-promise: 6.1.1(eslint@8.56.0) - jest: 29.7.0(@types/node@22.15.29)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3)) - js-yaml: 4.1.0 - prettier: 3.2.5 - typescript: 5.8.3 - transitivePeerDependencies: - - '@types/node' - - babel-plugin-macros - - node-notifier - - supports-color - - ts-node - '@rush-temp/communication@file:projects/communication.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@22.15.29)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.25.9)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3))': dependencies: '@types/jest': 29.5.12 @@ -25144,7 +25090,7 @@ snapshots: - node-notifier - supports-color - '@rush-temp/pod-github@file:projects/pod-github.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@swc/core@1.13.5)(babel-jest@29.7.0(@babel/core@7.23.9))(bufferutil@4.0.8)(gcp-metadata@5.3.0(encoding@0.1.13))(snappy@7.2.2)(socks@2.8.3)(utf-8-validate@6.0.4)(y-prosemirror@1.3.6(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23))': + '@rush-temp/pod-github@file:projects/pod-github.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@swc/core@1.13.5)(babel-jest@29.7.0(@babel/core@7.23.9))(bufferutil@4.0.8)(gcp-metadata@5.3.0(encoding@0.1.13))(snappy@7.2.2)(socks@2.8.3)(utf-8-validate@6.0.4)(y-prosemirror@1.3.7(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27))': dependencies: '@octokit/types': 12.6.0 '@octokit/webhooks': 12.2.0 @@ -25153,8 +25099,8 @@ snapshots: '@tiptap/extension-bubble-menu': 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7) '@tiptap/extension-code': 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7)) '@tiptap/extension-code-block': 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7) - '@tiptap/extension-collaboration': 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7)(y-prosemirror@1.3.6(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23)) - '@tiptap/extension-collaboration-cursor': 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(y-prosemirror@1.3.6(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23)) + '@tiptap/extension-collaboration': 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7)(y-prosemirror@1.3.7(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27)) + '@tiptap/extension-collaboration-cursor': 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(y-prosemirror@1.3.7(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27)) '@tiptap/extension-gapcursor': 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7) '@tiptap/extension-heading': 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7)) '@tiptap/extension-highlight': 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7)) @@ -25435,47 +25381,6 @@ snapshots: - node-notifier - supports-color - '@rush-temp/pod-msg2file@file:projects/pod-msg2file.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@swc/core@1.13.5)(babel-jest@29.7.0(@babel/core@7.23.9))': - dependencies: - '@tsconfig/node16': 1.0.4 - '@types/cors': 2.8.17 - '@types/express': 4.17.21 - '@types/jest': 29.5.12 - '@types/js-yaml': 4.0.9 - '@types/node': 22.15.29 - '@types/node-cron': 3.0.11 - '@types/uuid': 8.3.4 - '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.8.3))(eslint@8.56.0)(typescript@5.8.3) - '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.8.3) - cors: 2.8.5 - dotenv: 16.0.3 - esbuild: 0.25.9 - eslint: 8.56.0 - eslint-config-standard-with-typescript: 40.0.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.8.3))(eslint@8.56.0)(typescript@5.8.3))(eslint-plugin-import@2.29.1(eslint@8.56.0))(eslint-plugin-n@15.7.0(eslint@8.56.0))(eslint-plugin-promise@6.1.1(eslint@8.56.0))(eslint@8.56.0)(typescript@5.8.3) - eslint-plugin-import: 2.29.1(eslint@8.56.0) - eslint-plugin-n: 15.7.0(eslint@8.56.0) - eslint-plugin-node: 11.1.0(eslint@8.56.0) - eslint-plugin-promise: 6.1.1(eslint@8.56.0) - express: 4.21.2 - jest: 29.7.0(@types/node@22.15.29)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3)) - js-yaml: 4.1.0 - node-cron: 3.0.3 - postgres: 3.4.7 - prettier: 3.2.5 - ts-jest: 29.1.2(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.25.9)(jest@29.7.0(@types/node@22.15.29)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3)))(typescript@5.8.3) - ts-node: 10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3) - typescript: 5.8.3 - uuid: 8.3.2 - transitivePeerDependencies: - - '@babel/core' - - '@jest/types' - - '@swc/core' - - '@swc/wasm' - - babel-jest - - babel-plugin-macros - - node-notifier - - supports-color - '@rush-temp/pod-notification@file:projects/pod-notification.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@swc/core@1.13.5)(babel-jest@29.7.0(@babel/core@7.23.9))': dependencies: '@tsconfig/node16': 1.0.4 @@ -26133,7 +26038,7 @@ snapshots: ts-jest: 29.1.2(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.25.9)(jest@29.7.0(@types/node@22.15.29)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3)))(typescript@5.8.3) typescript: 5.8.3 uuid: 8.3.2 - yjs: 13.6.23 + yjs: 13.6.27 transitivePeerDependencies: - '@babel/core' - '@jest/types' @@ -29891,6 +29796,7 @@ snapshots: eslint-plugin-n: 15.7.0(eslint@8.56.0) eslint-plugin-promise: 6.1.1(eslint@8.56.0) fast-equals: 5.2.2 + hash-it: 6.0.0 jest: 29.7.0(@types/node@22.15.29)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3)) jest-environment-jsdom: 29.7.0(bufferutil@4.0.8)(utf-8-validate@6.0.4) prettier: 3.2.5 @@ -29937,15 +29843,15 @@ snapshots: '@rush-temp/text-editor-resources@file:projects/text-editor-resources.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@22.15.29)(babel-jest@29.7.0(@babel/core@7.23.9))(bufferutil@4.0.8)(esbuild@0.25.9)(highlight.js@11.11.1)(postcss-load-config@4.0.2(postcss@8.5.3)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3)))(postcss@8.5.3)(prosemirror-inputrules@1.4.0)(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3))(utf-8-validate@6.0.4)': dependencies: - '@hocuspocus/provider': 2.15.2(bufferutil@4.0.8)(utf-8-validate@6.0.4)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23) + '@hocuspocus/provider': 2.15.2(bufferutil@4.0.8)(utf-8-validate@6.0.4)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27) '@tiptap/core': 2.11.7(@tiptap/pm@2.11.7) '@tiptap/extension-bubble-menu': 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7) '@tiptap/extension-bullet-list': 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7)) '@tiptap/extension-code': 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7)) '@tiptap/extension-code-block': 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7) '@tiptap/extension-code-block-lowlight': 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/extension-code-block@2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7)(highlight.js@11.11.1)(lowlight@3.3.0) - '@tiptap/extension-collaboration': 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7)(y-prosemirror@1.3.6(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23)) - '@tiptap/extension-collaboration-cursor': 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(y-prosemirror@1.3.6(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23)) + '@tiptap/extension-collaboration': 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7)(y-prosemirror@1.3.7(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27)) + '@tiptap/extension-collaboration-cursor': 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(y-prosemirror@1.3.7(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27)) '@tiptap/extension-hard-break': 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7)) '@tiptap/extension-heading': 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7)) '@tiptap/extension-highlight': 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7)) @@ -29978,7 +29884,7 @@ snapshots: eslint-plugin-svelte: 2.35.1(eslint@8.56.0)(svelte@4.2.20)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3)) fast-equals: 5.2.2 jest: 29.7.0(@types/node@22.15.29)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3)) - lib0: 0.2.89 + lib0: 0.2.114 lowlight: 3.3.0 mermaid: 11.4.1 prettier: 3.2.5 @@ -29995,11 +29901,11 @@ snapshots: tippy.js: 6.3.7 ts-jest: 29.1.2(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.25.9)(jest@29.7.0(@types/node@22.15.29)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3)))(typescript@5.8.3) typescript: 5.8.3 - y-indexeddb: 9.0.12(yjs@13.6.23) - y-prosemirror: 1.3.6(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23) - y-protocols: 1.0.6(yjs@13.6.23) - y-websocket: 2.1.0(yjs@13.6.23) - yjs: 13.6.23 + y-indexeddb: 9.0.12(yjs@13.6.27) + y-prosemirror: 1.3.7(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27) + y-protocols: 1.0.6(yjs@13.6.27) + y-websocket: 2.1.0(yjs@13.6.27) + yjs: 13.6.27 transitivePeerDependencies: - '@babel/core' - '@jest/types' @@ -30108,7 +30014,7 @@ snapshots: - supports-color - ts-node - '@rush-temp/text-ydoc@file:projects/text-ydoc.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@22.15.29)(babel-jest@29.7.0(@babel/core@7.23.9))(bufferutil@4.0.8)(esbuild@0.25.9)(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3))(utf-8-validate@6.0.4)(y-protocols@1.0.6(yjs@13.6.23))': + '@rush-temp/text-ydoc@file:projects/text-ydoc.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@22.15.29)(babel-jest@29.7.0(@babel/core@7.23.9))(bufferutil@4.0.8)(esbuild@0.25.9)(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3))(utf-8-validate@6.0.4)(y-protocols@1.0.6(yjs@13.6.27))': dependencies: '@types/jest': 29.5.12 '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.8.3))(eslint@8.56.0)(typescript@5.8.3) @@ -30121,11 +30027,12 @@ snapshots: fast-equals: 5.2.2 jest: 29.7.0(@types/node@22.15.29)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3)) jest-environment-jsdom: 29.7.0(bufferutil@4.0.8)(utf-8-validate@6.0.4) + lib0: 0.2.114 prettier: 3.2.5 ts-jest: 29.1.2(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.25.9)(jest@29.7.0(@types/node@22.15.29)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.8.3)))(typescript@5.8.3) typescript: 5.8.3 - y-prosemirror: 1.3.6(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23) - yjs: 13.6.23 + y-prosemirror: 1.3.7(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27) + yjs: 13.6.27 transitivePeerDependencies: - '@babel/core' - '@jest/types' @@ -30348,6 +30255,7 @@ snapshots: '@elastic/elasticsearch': 7.17.14 '@faker-js/faker': 8.4.1 '@types/jest': 29.5.12 + '@types/js-yaml': 4.0.9 '@types/mime-types': 2.1.4 '@types/minio': 7.0.18 '@types/node': 22.15.29 @@ -31519,16 +31427,16 @@ snapshots: dependencies: '@tiptap/core': 2.11.7(@tiptap/pm@2.11.7) - '@tiptap/extension-collaboration-cursor@2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(y-prosemirror@1.3.6(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23))': + '@tiptap/extension-collaboration-cursor@2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(y-prosemirror@1.3.7(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27))': dependencies: '@tiptap/core': 2.11.7(@tiptap/pm@2.11.7) - y-prosemirror: 1.3.6(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23) + y-prosemirror: 1.3.7(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27) - '@tiptap/extension-collaboration@2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7)(y-prosemirror@1.3.6(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23))': + '@tiptap/extension-collaboration@2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7)(y-prosemirror@1.3.7(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27))': dependencies: '@tiptap/core': 2.11.7(@tiptap/pm@2.11.7) '@tiptap/pm': 2.11.7 - y-prosemirror: 1.3.6(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23) + y-prosemirror: 1.3.7(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27) '@tiptap/extension-document@2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))': dependencies: @@ -32146,8 +32054,6 @@ snapshots: dependencies: '@types/node': 22.15.29 - '@types/node-cron@3.0.11': {} - '@types/node-fetch@2.6.12': dependencies: '@types/node': 22.15.29 @@ -35811,6 +35717,8 @@ snapshots: has-unicode@2.0.1: {} + hash-it@6.0.0: {} + hasown@2.0.1: dependencies: function-bind: 1.1.2 @@ -37085,15 +36993,7 @@ snapshots: lexorank@1.0.5: {} - lib0@0.2.109: - dependencies: - isomorphic.js: 0.2.5 - - lib0@0.2.89: - dependencies: - isomorphic.js: 0.2.5 - - lib0@0.2.99: + lib0@0.2.114: dependencies: isomorphic.js: 0.2.5 @@ -37734,10 +37634,6 @@ snapshots: dependencies: semver: 7.7.2 - node-cron@3.0.3: - dependencies: - uuid: 8.3.2 - node-domexception@1.0.0: {} node-fetch@2.7.0(encoding@0.1.13): @@ -40752,41 +40648,41 @@ snapshots: xtend@4.0.2: {} - y-indexeddb@9.0.12(yjs@13.6.23): + y-indexeddb@9.0.12(yjs@13.6.27): dependencies: lib0: 0.2.89 - yjs: 13.6.23 + yjs: 13.6.27 - y-leveldb@0.1.2(yjs@13.6.23): + y-leveldb@0.1.2(yjs@13.6.27): dependencies: level: 6.0.1 - lib0: 0.2.99 - yjs: 13.6.23 + lib0: 0.2.109 + yjs: 13.6.27 optional: true - y-prosemirror@1.3.6(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.23))(yjs@13.6.23): + y-prosemirror@1.3.7(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27): dependencies: lib0: 0.2.109 prosemirror-model: 1.24.1 prosemirror-state: 1.4.3 prosemirror-view: 1.37.2 - y-protocols: 1.0.6(yjs@13.6.23) - yjs: 13.6.23 + y-protocols: 1.0.6(yjs@13.6.27) + yjs: 13.6.27 - y-protocols@1.0.6(yjs@13.6.23): + y-protocols@1.0.6(yjs@13.6.27): dependencies: lib0: 0.2.89 - yjs: 13.6.23 + yjs: 13.6.27 - y-websocket@2.1.0(yjs@13.6.23): + y-websocket@2.1.0(yjs@13.6.27): dependencies: - lib0: 0.2.89 + lib0: 0.2.114 lodash.debounce: 4.0.8 - y-protocols: 1.0.6(yjs@13.6.23) - yjs: 13.6.23 + y-protocols: 1.0.6(yjs@13.6.27) + yjs: 13.6.27 optionalDependencies: ws: 6.2.2 - y-leveldb: 0.1.2(yjs@13.6.23) + y-leveldb: 0.1.2(yjs@13.6.27) y18n@4.0.3: {} @@ -40841,9 +40737,9 @@ snapshots: buffer-crc32: 0.2.13 fd-slicer: 1.1.0 - yjs@13.6.23: + yjs@13.6.27: dependencies: - lib0: 0.2.99 + lib0: 0.2.109 ylru@1.3.2: {} diff --git a/common/scripts/docker.sh b/common/scripts/docker.sh index fc5085a4a7..01a4553752 100755 --- a/common/scripts/docker.sh +++ b/common/scripts/docker.sh @@ -19,7 +19,6 @@ rush docker:build -p 20 \ --to @hcengineering/pod-datalake \ --to @hcengineering/pod-mail-worker \ --to @hcengineering/pod-export \ ---to @hcengineering/pod-msg2file \ --to @hcengineering/pod-media \ --to @hcengineering/pod-preview \ --to @hcengineering/pod-external \ diff --git a/communication b/communication index eb30332c8b..961934e8dd 160000 --- a/communication +++ b/communication @@ -1 +1 @@ -Subproject commit eb30332c8ba9bb0820c0b3ad8aa353c393aa07c9 +Subproject commit 961934e8dd2b9df0b3ca94650e370ec900436e32 diff --git a/desktop/public/TrayIconWithBadge.ico b/desktop/public/TrayIconWithBadge.ico new file mode 100644 index 0000000000..8f3539423c Binary files /dev/null and b/desktop/public/TrayIconWithBadge.ico differ diff --git a/desktop/src/__test__/main/selfCheckingNode.test.ts b/desktop/src/__test__/main/selfCheckingNode.test.ts index b21a301256..e118730320 100644 --- a/desktop/src/__test__/main/selfCheckingNode.test.ts +++ b/desktop/src/__test__/main/selfCheckingNode.test.ts @@ -14,9 +14,8 @@ // describe('node environment self checking', () => { - test('check Jest\'s node environment', () => { - const isNodeAvailable = typeof process !== 'undefined'; - expect(isNodeAvailable).toBe(true); - }) - + test('check Jest\'s node environment', () => { + const isNodeAvailable = typeof process !== 'undefined' + expect(isNodeAvailable).toBe(true) + }) }) diff --git a/desktop/src/__test__/main/settings.test.ts b/desktop/src/__test__/main/settings.test.ts new file mode 100644 index 0000000000..3db1f225b9 --- /dev/null +++ b/desktop/src/__test__/main/settings.test.ts @@ -0,0 +1,198 @@ +// +// Copyright © 2025 Hardcore Engineering Inc. +// +// Licensed under the Eclipse Public License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. You may +// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import { Settings } from '../../main/settings' +import { PackedConfig } from '../../main/config' + +const createMockStore = (): { get: jest.Mock, set: jest.Mock } => { + const store: Record = {} + return { + get: jest.fn((key: string) => store[key]), + set: jest.fn((key: string, value: any) => { store[key] = value }) + } +} + +jest.mock('electron-store', () => { + return jest.fn() +}) + +describe('Settings', () => { + let originalEnvironment: NodeJS.ProcessEnv + let stubStoreInstance: ReturnType + + beforeEach(() => { + originalEnvironment = process.env + process.env = { ...originalEnvironment } + stubStoreInstance = createMockStore() + jest.clearAllMocks() + }) + + afterEach(() => { + process.env = originalEnvironment + jest.clearAllMocks() + }) + + describe('readServerUrl', () => { + test('isDev is true', () => { + const systemUnderTest = new Settings(stubStoreInstance as any, true) + + const actualUrl = systemUnderTest.readServerUrl() + + expect(actualUrl).toBe('http://huly.local:8087') + }) + + test('isDev is true and FRONT_URL is set', () => { + process.env.FRONT_URL = 'http://custom-dev.local:3000' + const systemUnderTest = new Settings(stubStoreInstance as any, true) + + const actualUrl = systemUnderTest.readServerUrl() + + expect(actualUrl).toBe('http://custom-dev.local:3000') + }) + + test('isDev is false and server is in store', () => { + const expectedUrl = 'https://stored.server.com' + stubStoreInstance.get.mockReturnValue(expectedUrl) + const systemUnderTest = new Settings(stubStoreInstance as any, false) + + const actualUrl = systemUnderTest.readServerUrl() + + expect(actualUrl).toBe(expectedUrl) + }) + + test('store is empty and packed config exists', () => { + stubStoreInstance.get.mockReturnValue(undefined) + const expectedUrl = 'https://packed.server.com' + const packedConfig: PackedConfig = { server: expectedUrl } + const systemUnderTest = new Settings(stubStoreInstance as any, false, packedConfig) + + const actualUrl = systemUnderTest.readServerUrl() + + expect(actualUrl).toBe(expectedUrl) + }) + + test('store and packed config are empty', () => { + stubStoreInstance.get.mockReturnValue(undefined) + const expectedUrl = 'https://env.server.com' + process.env.FRONT_URL = expectedUrl + const systemUnderTest = new Settings(stubStoreInstance as any, false) + + const actualUrl = systemUnderTest.readServerUrl() + + expect(actualUrl).toBe(expectedUrl) + }) + + test('all options are unavailable', () => { + stubStoreInstance.get.mockReturnValue(undefined) + delete process.env.FRONT_URL + const systemUnderTest = new Settings(stubStoreInstance as any, false) + + const result = systemUnderTest.readServerUrl() + + expect(result).toBe('https://huly.app') + }) + + test('all (store, packed config, environment) options are available', () => { + const expectedUrl = 'https://store.priority.com' + stubStoreInstance.get.mockReturnValue(expectedUrl) + process.env.FRONT_URL = 'https://env.server.com' + const packedConfig: PackedConfig = { server: 'https://packed.server.com' } + const systemUnderTest = new Settings(stubStoreInstance as any, false, packedConfig) + + const actualUrl = systemUnderTest.readServerUrl() + + expect(actualUrl).toBe(expectedUrl) + }) + }) + + describe('read/write', () => { + let systemUnderTest: Settings + beforeEach(() => { + systemUnderTest = new Settings(stubStoreInstance as any, false) + }) + + describe('isMinimizeToTrayEnabled', () => { + test.each([ + { storedValue: true, expected: true, description: 'stored value is true' }, + { storedValue: false, expected: false, description: 'stored value is false' } + ])('$description', ({ storedValue, expected }) => { + stubStoreInstance.get.mockReturnValue(storedValue) + + const actualValue = systemUnderTest.isMinimizeToTrayEnabled() + + expect(actualValue).toBe(expected) + }) + + test.each([ + { storedValue: undefined, description: 'no value is stored (undefined)' }, + { storedValue: null, description: 'stored value is null' } + ])('$description', ({ storedValue }) => { + stubStoreInstance.get.mockReturnValue(storedValue) + + const actualValue = systemUnderTest.isMinimizeToTrayEnabled() + + expect(actualValue).toBe(false) + }) + }) + + describe('setMinimizeToTrayEnabled', () => { + test.each([ + { value: true, description: 'stored value is true' }, + { value: false, description: 'stored value is false' } + ])('$description', ({ value }) => { + systemUnderTest.setMinimizeToTrayEnabled(value) + + expect(systemUnderTest.isMinimizeToTrayEnabled()).toBe(value) + }) + }) + + describe('setServerUrl', () => { + test('write than read', () => { + const expectedUrl = 'https://new.server.com' + + systemUnderTest.setServerUrl(expectedUrl) + + expect(systemUnderTest.readServerUrl()).toBe(expectedUrl) + }) + }) + + describe('getWindowBounds', () => { + test('read', () => { + const expectedValue = { x: 100, y: 300, width: 500, height: 700 } + stubStoreInstance.get.mockReturnValue(expectedValue) + + const actulValue = systemUnderTest.getWindowBounds() + + expect(actulValue).toEqual(expectedValue) + }) + + test('no bounds are stored', () => { + stubStoreInstance.get.mockReturnValue(undefined) + + expect(systemUnderTest.getWindowBounds()).toBeUndefined() + }) + }) + + describe('setWindowBounds', () => { + test('write than read', () => { + const expectedValue = { x: 100, y: 200, width: 800, height: 600 } + + systemUnderTest.setWindowBounds(expectedValue) + + expect(systemUnderTest.getWindowBounds()).toBe(expectedValue) + }) + }) + }) +}) diff --git a/desktop/src/__test__/main/trayUtils.test.ts b/desktop/src/__test__/main/trayUtils.test.ts new file mode 100644 index 0000000000..2927f6d5d7 --- /dev/null +++ b/desktop/src/__test__/main/trayUtils.test.ts @@ -0,0 +1,67 @@ +// +// Copyright © 2025 Hardcore Engineering Inc. +// +// Licensed under the Eclipse Public License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. You may +// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import { getBadgeIconInfo } from '../../main/trayUtils' + +describe('getBadgeIconInfo', () => { + const baseTitle = 'Huly' + + it('count of 0', () => { + const result = getBadgeIconInfo(0, baseTitle) + expect(result).toEqual({ + fileName: '', + tooltip: baseTitle + }) + }) + + it('negative count', () => { + const result = getBadgeIconInfo(-5, baseTitle) + expect(result).toEqual({ + fileName: '', + tooltip: baseTitle + }) + }) + + it.each([1, 2, 3, 4, 5, 6, 7, 8, 9])('count of %i', (count: number) => { + const result = getBadgeIconInfo(count, baseTitle) + expect(result).toEqual({ + fileName: 'TrayIconWithBadge.ico', + tooltip: `${baseTitle}: ${count} unread` + }) + }) + + describe('badge count 10-98', () => { + const testCases: number[] = [] + for (let i = 10; i <= 98; i++) { + testCases.push(i) + } + + it.each(testCases)('count of %i', (count: number) => { + const result = getBadgeIconInfo(count, baseTitle) + expect(result).toEqual({ + fileName: 'TrayIconWithBadge.ico', + tooltip: `${baseTitle}: ${count} unread` + }) + }) + }) + + it.each([99, 100, 200, 301])('count of %i', (count: number) => { + const result = getBadgeIconInfo(count, baseTitle) + expect(result).toEqual({ + fileName: 'TrayIconWithBadge.ico', + tooltip: `${baseTitle}: ${count} unread` + }) + }) +}) diff --git a/desktop/src/main/config.ts b/desktop/src/main/config.ts index bd14c20136..ea6d211224 100644 --- a/desktop/src/main/config.ts +++ b/desktop/src/main/config.ts @@ -15,12 +15,12 @@ import * as path from 'path' import * as fs from 'fs' -interface PackedConfig { +export interface PackedConfig { server?: string updatesChannelKey?: string } -const configPath = path.join(process.resourcesPath, 'config/config.json') +const configPath = path.join(process.resourcesPath, 'config', 'config.json') export function readPackedConfig (): PackedConfig | undefined { if (fs.existsSync(configPath)) { diff --git a/desktop/src/main/customMenu.ts b/desktop/src/main/customMenu.ts index 915dea39ae..84b20eac2c 100644 --- a/desktop/src/main/customMenu.ts +++ b/desktop/src/main/customMenu.ts @@ -13,10 +13,11 @@ // limitations under the License. // -import { app, BrowserWindow } from 'electron' +import { BrowserWindow } from 'electron' import { MenuBarAction, CommandLogout, CommandSelectWorkspace, CommandOpenSettings } from '../ui/types' +import { TrayController } from './tray' -export function dispatchMenuBarAction (mainWindow: BrowserWindow | undefined, action: MenuBarAction): void { +export function dispatchMenuBarAction (mainWindow: BrowserWindow | undefined, action: MenuBarAction, tray: TrayController | undefined): void { if (mainWindow == null) { return } @@ -42,7 +43,7 @@ export function dispatchMenuBarAction (mainWindow: BrowserWindow | undefined, ac mainWindow.webContents.send(CommandLogout) break case 'exit': - app.quit() + mainWindow.close() break case 'undo': mainWindow.webContents.undo() @@ -86,6 +87,13 @@ export function dispatchMenuBarAction (mainWindow: BrowserWindow | undefined, ac case 'toggle-fullscreen': mainWindow.setFullScreen(!mainWindow.isFullScreen()) break + case 'toggle-minimize-to-tray': { + if (tray != null) { + const newSetting = tray.toggleMinimizeToTray() + mainWindow.webContents.send('minimize-to-tray-setting-changed', newSetting) + } + break + } default: console.log('unknown menu action:', action) } diff --git a/services/msg2file/src/index.ts b/desktop/src/main/path.ts similarity index 75% rename from services/msg2file/src/index.ts rename to desktop/src/main/path.ts index 8dc27a41ea..5de505a45f 100644 --- a/services/msg2file/src/index.ts +++ b/desktop/src/main/path.ts @@ -13,9 +13,9 @@ // limitations under the License. // -import { config } from 'dotenv' +import { app } from 'electron' +import path from 'path' -import { main } from './main' - -config() -void main() +export function getFileInPublicBundledFolder (fileName: string): string { + return path.join(app.getAppPath(), 'dist', 'ui', 'public', fileName) +} diff --git a/desktop/src/main/settings.ts b/desktop/src/main/settings.ts new file mode 100644 index 0000000000..1996b23141 --- /dev/null +++ b/desktop/src/main/settings.ts @@ -0,0 +1,65 @@ +// +// Copyright © 2024 Hardcore Engineering Inc. +// +// Licensed under the Eclipse Public License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. You may +// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import Store from 'electron-store' +import { PackedConfig } from './config' + +export class Settings { + private static readonly SETTINGS_KEY_SERVER = 'server' + private static readonly SETTINGS_KEY_MINIMIZE_TO_TRAY = 'minimize-to-tray' + private static readonly SETTINGS_KEY_WINDOW_BOUNDS = 'windowBounds' + + private readonly store: Store + private readonly isDev: boolean + private readonly packedConfig?: PackedConfig + + constructor (store: Store, isDev: boolean, packedConfig?: PackedConfig) { + this.store = store + this.isDev = isDev + this.packedConfig = packedConfig + } + + readServerUrl (): string { + if (this.isDev) { + return process.env.FRONT_URL ?? 'http://huly.local:8087' + } + return ( + (this.store as any).get(Settings.SETTINGS_KEY_SERVER) as string ?? + this.packedConfig?.server ?? + process.env.FRONT_URL ?? + 'https://huly.app' + ) + } + + isMinimizeToTrayEnabled (): boolean { + return (this.store as any).get(Settings.SETTINGS_KEY_MINIMIZE_TO_TRAY) as boolean ?? false + } + + setMinimizeToTrayEnabled (enabled: boolean): void { + (this.store as any).set(Settings.SETTINGS_KEY_MINIMIZE_TO_TRAY, enabled) + } + + setServerUrl (serverUrl: string): void { + (this.store as any).set(Settings.SETTINGS_KEY_SERVER, serverUrl) + } + + getWindowBounds (): any { + return (this.store as any).get(Settings.SETTINGS_KEY_WINDOW_BOUNDS) + } + + setWindowBounds (bounds: any): void { + (this.store as any).set(Settings.SETTINGS_KEY_WINDOW_BOUNDS, bounds) + } +} diff --git a/desktop/src/main/start.ts b/desktop/src/main/start.ts index 021f96f71f..eef60b5b07 100644 --- a/desktop/src/main/start.ts +++ b/desktop/src/main/start.ts @@ -14,7 +14,7 @@ // import { config as dotenvConfig } from 'dotenv' -import { BrowserWindow, CookiesSetDetails, Notification, app, desktopCapturer, dialog, ipcMain, nativeImage, session, shell, systemPreferences, nativeTheme } from 'electron' +import { globalShortcut, Event, BrowserWindow, CookiesSetDetails, Notification, app, desktopCapturer, dialog, ipcMain, nativeImage, session, shell, systemPreferences, nativeTheme } from 'electron' import contextMenu from 'electron-context-menu' import log from 'electron-log' import Store from 'electron-store' @@ -22,7 +22,7 @@ import { ProgressInfo, UpdateInfo } from 'electron-updater' import WinBadge from 'electron-windows-badge' import * as path from 'path' -import { Config, MenuBarAction, NotificationParams, JumpListSpares } from '../ui/types' +import { Config, MenuBarAction, NotificationParams, JumpListSpares, CommandCloseTab } from '../ui/types' import { getOptions } from './args' import { addMenus } from './standardMenu' import { dispatchMenuBarAction } from './customMenu' @@ -32,536 +32,587 @@ import { generateId } from '@hcengineering/core' import { DownloadItem } from '@hcengineering/desktop-downloads' import { rebuildJumpList, setupWindowsSpecific } from './windowsSpecificSetup' import { readPackedConfig } from './config' +import { Settings } from './settings' +import { TrayController } from './tray' +import { getFileInPublicBundledFolder } from './path' -let mainWindow: BrowserWindow | undefined -let winBadge: any +let isQuiting = false -const isMac = process.platform === 'darwin' -const isWindows = process.platform === 'win32' -const isDev = process.env.NODE_ENV === 'development' - -const sessionPartition = !isDev ? 'persist:huly' : 'persist:huly_dev' -const iconKey = path.join(app.getAppPath(), 'dist', 'ui', 'public', isWindows ? 'AppIcon.ico' : 'AppIcon.png') -const preloadScriptPath = path.join(app.getAppPath(), 'dist', 'main', 'preload.js') - -const defaultWidth = 1440 -const defaultHeight = 960 - -const packedConfig = readPackedConfig() -log.info('packed config', packedConfig) - -const envPath = path.join(app.getAppPath(), isDev ? '.env-dev' : '.env') -console.log('do loading env from', envPath) -dotenvConfig({ - path: envPath -}) -const options = getOptions() - -const containerPageFileName = isWindows ? 'index.windows.html' : 'index.html' -const containerPagePath = path.join('dist', 'ui', containerPageFileName) - -// Note: using electron-store here as local storage is not available in the main process -// before the window is created -const settings = new Store() -const oldFront = readServerUrl() - -if (options.server !== undefined) { - ;(settings as any).set('server', options.server) -} - -const FRONT_URL = readServerUrl() -const serverChanged = oldFront !== FRONT_URL - -function readServerUrl (): string { - if (isDev) { - return process.env.FRONT_URL ?? 'http://huly.local:8087' - } - - return ((settings as any).get('server') as string) ?? packedConfig?.server ?? process.env.FRONT_URL ?? 'https://huly.app' -} - -// Handle creating/removing shortcuts on Windows when installing/uninstalling. -if (require('electron-squirrel-startup') === true) { +function quitApplication (): void { + isQuiting = true app.quit() } -console.log('Running Huly', process.env.MODEL_VERSION, process.env.VERSION, isMac, isDev, process.env.NODE_ENV) - -// Fix screen-sharing thumbnails being missing sometimes -// See https://github.com/electron/electron/issues/44504 -const disabledFeatures = [ - 'ThumbnailCapturerMac:capture_mode/sc_screenshot_manager', - 'ScreenCaptureKitPickerScreen', - 'ScreenCaptureKitStreamPickerSonoma' -] - -app.commandLine.appendSwitch('disable-features', disabledFeatures.join(',')) - -function setupWindowTitleBar (windowOptions: Electron.BrowserWindowConstructorOptions): void { - if (isWindows) { - // on Windows we use frameless window with custom hand-made title bar - windowOptions.frame = false - } else { - windowOptions.titleBarStyle = isMac ? 'hidden' : 'default' - } -} - -function hookOpenWindow (window: BrowserWindow): void { - window.webContents.setWindowOpenHandler(({ url }) => { - console.log('opening window', url) - - /* - We need to detect if url is "our" or external. We should - open external urls in system browser - - When we open local URLs it would be as file:///workbench/my-spc/tracker/TSK-2 - As we load only our index.html there is no security problem to pass such URLs - to open arg as well - */ - if (url.indexOf(FRONT_URL) !== 0 && url.indexOf('file://') !== 0) { - void shell.openExternal(url) - } else { - void (async (): Promise => { - const bounds = mainWindow?.getBounds() - const windowOptions: Electron.BrowserWindowConstructorOptions = { - width: bounds?.width ?? defaultWidth, - height: bounds?.height ?? defaultHeight, - x: (bounds?.x ?? 0) + 25, - y: (bounds?.y ?? 0) + 25, - trafficLightPosition: { x: 10, y: 10 }, - icon: nativeImage.createFromPath(iconKey), - webPreferences: { - devTools: true, - sandbox: false, - partition: sessionPartition, - nodeIntegration: true, - preload: preloadScriptPath, - additionalArguments: [ - `--open=${encodeURI( - new URL(url).pathname - .split('/') - .filter((it) => it.length > 0) - .join('/') - )}` - ] - } - } - setupWindowTitleBar(windowOptions) - const childWindow = new BrowserWindow(windowOptions) - await childWindow.loadFile(containerPagePath) - hookOpenWindow(childWindow) - })() - } - return { action: 'deny' } - }) -} - -function setupCookieHandler (config: Config): void { - const normalizedAccountsUrl = config.ACCOUNTS_URL.endsWith('/') ? config.ACCOUNTS_URL : config.ACCOUNTS_URL + '/' - const urls = [ - normalizedAccountsUrl, - normalizedAccountsUrl + '*' - ] - - session.defaultSession.webRequest.onHeadersReceived({ urls }, handleSetCookie) - session.fromPartition(sessionPartition).webRequest.onHeadersReceived({ urls }, handleSetCookie) -} - -function handleSetCookie (details: Electron.OnHeadersReceivedListenerDetails, callback: (headersReceivedResponse: Electron.HeadersReceivedResponse) => void): void { - if (details.responseHeaders !== undefined) { - for (const header in details.responseHeaders) { - if (header.toLowerCase() === 'set-cookie') { - const cookies = details.responseHeaders[header] - details.responseHeaders[header] = cookies.map((cookie) => { - if (!cookie.includes('SameSite=')) { - if (details.url.startsWith('https://') && !cookie.includes('; Secure')) { - cookie += '; Secure' - } - cookie += '; SameSite=None' - } - return cookie - }) - } - } - } - - // eslint-disable-next-line n/no-callback-literal - callback({ responseHeaders: { ...details.responseHeaders } }) -} - -function handleAuthRedirects (window: BrowserWindow): void { - window.webContents.on('will-redirect', (event) => { - if (event?.url.startsWith(`${FRONT_URL}/login/auth`)) { - console.log('Auth happened, redirecting to local index') - const urlObj = new URL(decodeURIComponent(event.url)) - event.preventDefault() - - void (async (): Promise => { - await window.loadFile(containerPagePath) - window.webContents.send('handle-auth', urlObj.searchParams.get('token')) - })() - } - }) -} - -function handleWillDownload (window: BrowserWindow): void { - window.webContents.session.on('will-download', (_event, item) => { - const key = generateId() - - const notifyDownloadUpdated = (): void => { - const download: DownloadItem = { - key, - state: item.isPaused() ? 'paused' : item.getState(), - fileName: item.getFilename(), - receivedBytes: item.getReceivedBytes(), - totalBytes: item.getTotalBytes(), - url: item.getURL(), - savePath: item.getSavePath() - } - window.webContents.send('handle-download-item', download) - } - - notifyDownloadUpdated() - - item.on('updated', notifyDownloadUpdated) - item.on('done', notifyDownloadUpdated) - }) -} - -const createWindow = async (): Promise => { - // Restore window position if available - const restoredBounds: any = settings.get('windowBounds') - const windowOptions: Electron.BrowserWindowConstructorOptions = { - width: restoredBounds?.width ?? defaultWidth, - height: restoredBounds?.height ?? defaultHeight, - x: restoredBounds?.x ?? undefined, - y: restoredBounds?.y ?? undefined, - trafficLightPosition: { x: 10, y: 10 }, - roundedCorners: true, - icon: nativeImage.createFromPath(iconKey), - webPreferences: { - devTools: true, - sandbox: false, - nodeIntegration: true, - // backgroundThrottling: false, - partition: sessionPartition, - preload: preloadScriptPath - } - } - setupWindowTitleBar(windowOptions) - mainWindow = new BrowserWindow(windowOptions) - app.dock?.setIcon(nativeImage.createFromPath(iconKey)) - // await mainWindow.webContents.openDevTools() - if (isDev) { - mainWindow.webContents.openDevTools() - } - await mainWindow.loadFile(containerPagePath) - addPermissionHandlers(mainWindow.webContents.session) - handleAuthRedirects(mainWindow) - handleWillDownload(mainWindow) - - // In this example, only windows with the `about:blank` url will be created. - // All other urls will be blocked. - hookOpenWindow(mainWindow) - - // Save window position on close - mainWindow.on('close', () => { - const bounds = mainWindow?.getBounds() - if (bounds !== undefined) { - settings.set('windowBounds', bounds) - } - }) - - function sendWindowMaximizedMessage (maximized: boolean): void { - mainWindow?.webContents.send('window-state-changed', maximized ? 'maximized' : 'unmaximized') - } - - mainWindow.on('blur', () => { - mainWindow?.webContents.send('window-focus-loss') - }) - - mainWindow.on('maximize', () => { - sendWindowMaximizedMessage(true) - }) - - mainWindow.on('unmaximize', () => { - sendWindowMaximizedMessage(false) - }) - - mainWindow.on('enter-full-screen', () => { - sendWindowMaximizedMessage(true) - }) - - mainWindow.on('leave-full-screen', () => { - if (mainWindow != null) { - sendWindowMaximizedMessage(mainWindow.isMaximized()) - } - }) - - if (isMac) { - mainWindow.on('close', (event) => { - // Prevent the default behavior (which would quit the app) - event.preventDefault() - // Hide the window - mainWindow?.hide() - }) - } else if (isWindows) { - winBadge = new WinBadge(mainWindow, { - font: '14px arial' - }) - } -} - -function sendCommand (cmd: string, ...args: any[]): void { - mainWindow?.webContents.send(cmd, ...args) -} - -function activateWindow (): void { - if (mainWindow != null) { - if (mainWindow.isMinimized()) { - mainWindow.restore() - } - mainWindow.show() - mainWindow.focus() - } -} - -if (isWindows) { - setupWindowsSpecific(activateWindow, sendCommand) -} else { - addMenus(sendCommand) -} - -contextMenu({ - showSaveImageAs: false, - showInspectElement: false, - showSelectAll: false -}) - -ipcMain.on('set-badge', (_event: any, badge: number) => { - app.dock?.setBadge(badge > 0 ? `${badge}` : '') - app.badgeCount = badge - - if (isWindows && winBadge !== undefined) { - winBadge.update(badge) - } -}) - -ipcMain.on('dock-bounce', (_event: any) => { - app.dock?.bounce('informational') -}) - -ipcMain.on('send-notification', (_event: any, notificationParams: NotificationParams) => { - if (Notification.isSupported()) { - const notification = new Notification(notificationParams) - - notification.on('click', () => { - mainWindow?.show() - mainWindow?.webContents.send('handle-notification-navigation', notificationParams) - }) - - notification.show() - } -}) - -ipcMain.on('set-title', (event: any, title: string) => { - const webContents = event.sender - const window = BrowserWindow.fromWebContents(webContents) - window?.setTitle(title) -}) - -ipcMain.on('set-combined-config', (_event: any, config: Config) => { - log.info('Config set: ', config) - - setupCookieHandler(config) - - const updatesUrl = process.env.DESKTOP_UPDATES_URL ?? config.DESKTOP_UPDATES_URL ?? 'https://dist.huly.io' - // NOTE: env format is: default_value;key1:value1;key2:value2... - const updatesChannels = (process.env.DESKTOP_UPDATES_CHANNEL ?? config.DESKTOP_UPDATES_CHANNELS ?? config.DESKTOP_UPDATES_CHANNEL ?? 'huly').split(';').map(c => c.trim().split(':')) - const updateChannelsMap: Record = {} - for (const channelInfo of updatesChannels) { - if (channelInfo.length === 1) { - updateChannelsMap.default = channelInfo[0] - } else if (channelInfo.length === 2) { - const [key, value] = channelInfo - updateChannelsMap[key] = value - } - } - - const updatesChannelKey = packedConfig?.updatesChannelKey ?? 'default' - const updatesChannel = updateChannelsMap[updatesChannelKey] ?? updateChannelsMap.default ?? 'huly' - - log.info('updates channels', updatesChannels) - log.info('updates channel', updatesChannelKey, updatesChannel) - - autoUpdater.setFeedURL({ - provider: 'generic', - url: updatesUrl, - channel: updatesChannel - }) - void autoUpdater.checkForUpdatesAndNotify() -}) - -ipcMain.handle('get-main-config', (_event: any, _path: any) => { - const cfg = { - CONFIG_URL: process.env.CONFIG_URL ?? '', - FRONT_URL, - INITIAL_URL: process.env.INITIAL_URL ?? '', - MODEL_VERSION: process.env.MODEL_VERSION ?? '', - VERSION: process.env.VERSION ?? '' - } - return cfg -}) -ipcMain.handle('get-host', (_event: any, _path: any) => { - return new URL(FRONT_URL).host -}) - -ipcMain.on('set-front-cookie', function (event: any, host: string, name: string, value: string) { - const webContents = event.sender - const win = BrowserWindow.fromWebContents(webContents) - const cv: CookiesSetDetails = { - url: host, - name, - value, - path: '/', - secure: true, - sameSite: 'no_restriction', - httpOnly: true, - domain: process.env.FRONT_DOMAIN - } - void win?.webContents?.session.cookies.set(cv) -}) - -ipcMain.handle('window-minimize', () => { - mainWindow?.minimize() -}) - -ipcMain.handle('window-maximize', () => { - if (mainWindow != null) { - if (mainWindow.isMaximized()) { - mainWindow.unmaximize() - } else { - mainWindow.maximize() - } - } -}) - -ipcMain.handle('window-close', () => { - mainWindow?.close() -}) - -ipcMain.handle('get-is-os-using-dark-theme', () => { - return nativeTheme.shouldUseDarkColors -}) - -ipcMain.handle('menu-action', async (_event: any, action: MenuBarAction) => { - dispatchMenuBarAction(mainWindow, action) -}) - -if (isWindows) { - ipcMain.on('rebuild-user-jump-list', (_event: any, spares: JumpListSpares) => { - rebuildJumpList(spares) - }) -} - const gotTheLock = app.requestSingleInstanceLock() if (!gotTheLock) { - app.quit() + quitApplication() +} else { + runTheApp() } -ipcMain.handle('get-screen-access', () => systemPreferences.getMediaAccessStatus('screen') === 'granted') -ipcMain.handle('get-screen-sources', () => { - return desktopCapturer.getSources({ types: ['window', 'screen'], fetchWindowIcons: true, thumbnailSize: { width: 225, height: 135 } }).then(async sources => { - return sources.map((source: any) => { - return { - ...source, - appIconURL: source.appIcon?.toDataURL(), - thumbnailURL: source.thumbnail.toDataURL() +function runTheApp (): void { + let winBadge: any + let mainWindow: BrowserWindow | undefined + + const isMac = process.platform === 'darwin' + const isWindows = process.platform === 'win32' + const isDev = process.env.NODE_ENV === 'development' + + const sessionPartition = !isDev ? 'persist:huly' : 'persist:huly_dev' + const iconKey = getFileInPublicBundledFolder(isWindows ? 'AppIcon.ico' : 'AppIcon.png') + const preloadScriptPath = path.join(app.getAppPath(), 'dist', 'main', 'preload.js') + + const defaultWidth = 1440 + const defaultHeight = 960 + + const packedConfig = readPackedConfig() + log.info('packed config', packedConfig) + + const envPath = path.join(app.getAppPath(), isDev ? '.env-dev' : '.env') + console.log('do loading env from', envPath) + dotenvConfig({ + path: envPath + }) + const options = getOptions() + + const containerPageFileName = isWindows ? 'index.windows.html' : 'index.html' + const containerPagePath = path.join('dist', 'ui', containerPageFileName) + + const CloseTabHotKey = 'CommandOrControl+W' + + // Note: using electron-store here as local storage is not available in the main process + // before the window is created + const settings = new Settings(new Store(), isDev, packedConfig) + const oldFront = settings.readServerUrl() + + if (options.server !== undefined) { + settings.setServerUrl(options.server) + } + + const FRONT_URL = settings.readServerUrl() + const serverChanged = oldFront !== FRONT_URL + + // Handle creating/removing shortcuts on Windows when installing/uninstalling. + if (require('electron-squirrel-startup') === true) { + quitApplication() + } + + console.log('Running Huly', process.env.MODEL_VERSION, process.env.VERSION, isMac, isDev, process.env.NODE_ENV) + + // Fix screen-sharing thumbnails being missing sometimes + // See https://github.com/electron/electron/issues/44504 + const disabledFeatures = [ + 'ThumbnailCapturerMac:capture_mode/sc_screenshot_manager', + 'ScreenCaptureKitPickerScreen', + 'ScreenCaptureKitStreamPickerSonoma' + ] + + app.commandLine.appendSwitch('disable-features', disabledFeatures.join(',')) + + function setupWindowTitleBar (windowOptions: Electron.BrowserWindowConstructorOptions): void { + if (isWindows) { + // on Windows we use frameless window with custom hand-made title bar + windowOptions.frame = false + } else { + windowOptions.titleBarStyle = isMac ? 'hidden' : 'default' + } + } + + function hookOpenWindow (window: BrowserWindow): void { + window.webContents.setWindowOpenHandler(({ url }) => { + console.log('opening window', url) + + /* + We need to detect if url is "our" or external. We should + open external urls in system browser + + When we open local URLs it would be as file:///workbench/my-spc/tracker/TSK-2 + As we load only our index.html there is no security problem to pass such URLs + to open arg as well + */ + if (url.indexOf(FRONT_URL) !== 0 && url.indexOf('file://') !== 0) { + void shell.openExternal(url) + } else { + void (async (): Promise => { + const bounds = mainWindow?.getBounds() + const windowOptions: Electron.BrowserWindowConstructorOptions = { + width: bounds?.width ?? defaultWidth, + height: bounds?.height ?? defaultHeight, + x: (bounds?.x ?? 0) + 25, + y: (bounds?.y ?? 0) + 25, + trafficLightPosition: { x: 10, y: 10 }, + icon: nativeImage.createFromPath(iconKey), + webPreferences: { + devTools: true, + sandbox: false, + partition: sessionPartition, + nodeIntegration: true, + preload: preloadScriptPath, + additionalArguments: [ + `--open=${encodeURI( + new URL(url).pathname + .split('/') + .filter((it) => it.length > 0) + .join('/') + )}` + ] + } + } + setupWindowTitleBar(windowOptions) + const childWindow = new BrowserWindow(windowOptions) + await childWindow.loadFile(containerPagePath) + hookOpenWindow(childWindow) + })() + } + return { action: 'deny' } + }) + } + + function setupCookieHandler (config: Config): void { + const normalizedAccountsUrl = config.ACCOUNTS_URL.endsWith('/') ? config.ACCOUNTS_URL : config.ACCOUNTS_URL + '/' + const urls = [ + normalizedAccountsUrl, + normalizedAccountsUrl + '*' + ] + + session.defaultSession.webRequest.onHeadersReceived({ urls }, handleSetCookie) + session.fromPartition(sessionPartition).webRequest.onHeadersReceived({ urls }, handleSetCookie) + } + + function handleSetCookie (details: Electron.OnHeadersReceivedListenerDetails, callback: (headersReceivedResponse: Electron.HeadersReceivedResponse) => void): void { + if (details.responseHeaders !== undefined) { + for (const header in details.responseHeaders) { + if (header.toLowerCase() === 'set-cookie') { + const cookies = details.responseHeaders[header] + details.responseHeaders[header] = cookies.map((cookie) => { + if (!cookie.includes('SameSite=')) { + if (details.url.startsWith('https://') && !cookie.includes('; Secure')) { + cookie += '; Secure' + } + cookie += '; SameSite=None' + } + return cookie + }) + } + } + } + + // eslint-disable-next-line n/no-callback-literal + callback({ responseHeaders: { ...details.responseHeaders } }) + } + + function handleAuthRedirects (window: BrowserWindow): void { + window.webContents.on('will-redirect', (event) => { + if (event?.url.startsWith(`${FRONT_URL}/login/auth`)) { + console.log('Auth happened, redirecting to local index') + const urlObj = new URL(decodeURIComponent(event.url)) + event.preventDefault() + + void (async (): Promise => { + await window.loadFile(containerPagePath) + window.webContents.send('handle-auth', urlObj.searchParams.get('token')) + })() } }) - }) -}) - -async function onReady (): Promise { - await createWindow() - - if (serverChanged) { - mainWindow?.webContents.send('logout') } -} -app.on('ready', () => { - void onReady() -}) + function handleWillDownload (window: BrowserWindow): void { + window.webContents.session.on('will-download', (_event, item) => { + const key = generateId() -app.on('window-all-closed', () => { - if (process.platform !== 'darwin') { - app.quit() + const notifyDownloadUpdated = (): void => { + const download: DownloadItem = { + key, + state: item.isPaused() ? 'paused' : item.getState(), + fileName: item.getFilename(), + receivedBytes: item.getReceivedBytes(), + totalBytes: item.getTotalBytes(), + url: item.getURL(), + savePath: item.getSavePath() + } + window.webContents.send('handle-download-item', download) + } + + notifyDownloadUpdated() + + item.on('updated', notifyDownloadUpdated) + item.on('done', notifyDownloadUpdated) + }) } -}) -if (isMac) { - app.on('activate', () => { - if (mainWindow != null && (mainWindow.isMinimized() || !mainWindow.isVisible())) { + const createWindow = async (): Promise => { + const restoredBounds: any = settings.getWindowBounds() + const windowOptions: Electron.BrowserWindowConstructorOptions = { + width: restoredBounds?.width ?? defaultWidth, + height: restoredBounds?.height ?? defaultHeight, + x: restoredBounds?.x ?? undefined, + y: restoredBounds?.y ?? undefined, + trafficLightPosition: { x: 10, y: 10 }, + roundedCorners: true, + icon: nativeImage.createFromPath(iconKey), + webPreferences: { + devTools: true, + sandbox: false, + nodeIntegration: true, + partition: sessionPartition, + preload: preloadScriptPath + } + } + setupWindowTitleBar(windowOptions) + mainWindow = new BrowserWindow(windowOptions) + app.dock?.setIcon(nativeImage.createFromPath(iconKey)) + if (isDev) { + mainWindow.webContents.openDevTools() + } + await mainWindow.loadFile(containerPagePath) + addPermissionHandlers(mainWindow.webContents.session) + handleAuthRedirects(mainWindow) + handleWillDownload(mainWindow) + + // In this example, only windows with the `about:blank` url will be created. + // All other urls will be blocked. + hookOpenWindow(mainWindow) + + function minimizeToTrayIsOn (): boolean { + return settings.isMinimizeToTrayEnabled() && trayController != null + } + + mainWindow.on('close', (event: Event) => { + const bounds = mainWindow?.getBounds() + if (bounds != null) { + settings.setWindowBounds(bounds) + } + + if (minimizeToTrayIsOn()) { + if (!isQuiting) { + event.preventDefault() + mainWindow?.hide() + return false + } + } + + if (isMac) { + event.preventDefault() + mainWindow?.hide() + } + }) + + function sendWindowMaximizedMessage (maximized: boolean): void { + mainWindow?.webContents.send('window-state-changed', maximized ? 'maximized' : 'unmaximized') + } + + mainWindow.on('focus', () => { + const registered = globalShortcut.register(CloseTabHotKey, () => { + sendCommand(CommandCloseTab) + }) + if (!registered) { + console.log(`failed to register global shortcut on ${CloseTabHotKey}`) + } + }) + + mainWindow.on('blur', () => { + globalShortcut.unregister(CloseTabHotKey) + mainWindow?.webContents.send('window-focus-loss') + }) + + mainWindow.on('maximize', () => { + sendWindowMaximizedMessage(true) + }) + + mainWindow.on('minimize', () => { + if (minimizeToTrayIsOn()) { + mainWindow?.hide() + } + }) + + mainWindow.on('unmaximize', () => { + sendWindowMaximizedMessage(false) + }) + + mainWindow.on('enter-full-screen', () => { + sendWindowMaximizedMessage(true) + }) + + mainWindow.on('leave-full-screen', () => { + if (mainWindow != null) { + sendWindowMaximizedMessage(mainWindow.isMaximized()) + } + }) + + if (isWindows) { + winBadge = new WinBadge(mainWindow, { + font: '14px arial' + }) + } + } + + function sendCommand (cmd: string, ...args: any[]): void { + mainWindow?.webContents.send(cmd, ...args) + } + + function activateWindow (): void { + if (mainWindow != null) { + if (mainWindow.isMinimized()) { + mainWindow.restore() + } mainWindow.show() + mainWindow.focus() + } + } + + let trayController: TrayController | undefined + + void app.whenReady().then(() => { + trayController = new TrayController(settings, activateWindow, quitApplication) + }) + + if (isWindows) { + setupWindowsSpecific(activateWindow, sendCommand) + } else { + addMenus(sendCommand) + } + + contextMenu({ + showSaveImageAs: false, + showInspectElement: false, + showSelectAll: false + }) + + ipcMain.on('set-badge', (_event: any, badge: number) => { + app.dock?.setBadge(badge > 0 ? `${badge}` : '') + app.badgeCount = badge + + if (isWindows && winBadge !== undefined) { + winBadge.update(badge) + } + trayController?.updateTrayBadge(badge) + }) + + ipcMain.on('dock-bounce', (_event: any) => { + app.dock?.bounce('informational') + }) + + ipcMain.on('send-notification', (_event: any, notificationParams: NotificationParams) => { + if (Notification.isSupported()) { + const notification = new Notification(notificationParams) + + notification.on('click', () => { + mainWindow?.show() + mainWindow?.webContents.send('handle-notification-navigation', notificationParams) + }) + + notification.show() } }) -} -app.on('before-quit', () => { - if (mainWindow !== undefined && !mainWindow.isDestroyed()) { - const bounds = mainWindow.getBounds() - settings.set('windowBounds', bounds) + + ipcMain.on('set-title', (event: any, title: string) => { + const webContents = event.sender + const window = BrowserWindow.fromWebContents(webContents) + window?.setTitle(title) + }) + + ipcMain.on('set-combined-config', (_event: any, config: Config) => { + log.info('Config set: ', config) + + setupCookieHandler(config) + + const updatesUrl = process.env.DESKTOP_UPDATES_URL ?? config.DESKTOP_UPDATES_URL ?? 'https://dist.huly.io' + // NOTE: env format is: default_value;key1:value1;key2:value2... + const updatesChannels = (process.env.DESKTOP_UPDATES_CHANNEL ?? config.DESKTOP_UPDATES_CHANNELS ?? config.DESKTOP_UPDATES_CHANNEL ?? 'huly').split(';').map(c => c.trim().split(':')) + const updateChannelsMap: Record = {} + for (const channelInfo of updatesChannels) { + if (channelInfo.length === 1) { + updateChannelsMap.default = channelInfo[0] + } else if (channelInfo.length === 2) { + const [key, value] = channelInfo + updateChannelsMap[key] = value + } + } + + const updatesChannelKey = packedConfig?.updatesChannelKey ?? 'default' + const updatesChannel = updateChannelsMap[updatesChannelKey] ?? updateChannelsMap.default ?? 'huly' + + log.info('updates channels', updatesChannels) + log.info('updates channel', updatesChannelKey, updatesChannel) + + autoUpdater.setFeedURL({ + provider: 'generic', + url: updatesUrl, + channel: updatesChannel + }) + void autoUpdater.checkForUpdatesAndNotify() + }) + + ipcMain.handle('get-main-config', (_event: any, _path: any) => { + const cfg = { + CONFIG_URL: process.env.CONFIG_URL ?? '', + FRONT_URL, + INITIAL_URL: process.env.INITIAL_URL ?? '', + MODEL_VERSION: process.env.MODEL_VERSION ?? '', + VERSION: process.env.VERSION ?? '' + } + return cfg + }) + ipcMain.handle('get-host', (_event: any, _path: any) => { + return new URL(FRONT_URL).host + }) + + ipcMain.on('set-front-cookie', function (event: any, host: string, name: string, value: string) { + const webContents = event.sender + const win = BrowserWindow.fromWebContents(webContents) + const cv: CookiesSetDetails = { + url: host, + name, + value, + path: '/', + secure: true, + sameSite: 'no_restriction', + httpOnly: true, + domain: process.env.FRONT_DOMAIN + } + void win?.webContents?.session.cookies.set(cv) + }) + + ipcMain.handle('window-minimize', () => { + mainWindow?.minimize() + }) + + ipcMain.handle('window-maximize', () => { + if (mainWindow != null) { + if (mainWindow.isMaximized()) { + mainWindow.unmaximize() + } else { + mainWindow.maximize() + } + } + }) + + ipcMain.handle('window-close', () => { + mainWindow?.close() + }) + + ipcMain.handle('get-is-os-using-dark-theme', () => { + return nativeTheme.shouldUseDarkColors + }) + + ipcMain.handle('menu-action', async (_event: any, action: MenuBarAction) => { + dispatchMenuBarAction(mainWindow, action, trayController) + }) + + if (isWindows) { + ipcMain.on('rebuild-user-jump-list', (_event: any, spares: JumpListSpares) => { + rebuildJumpList(spares) + }) } - // Note: in case the app is exited by auto-updater all windows will be destroyed at this point - if (mainWindow === undefined || mainWindow.isDestroyed()) return + + ipcMain.handle('get-screen-access', () => systemPreferences.getMediaAccessStatus('screen') === 'granted') + ipcMain.handle('get-screen-sources', () => { + return desktopCapturer.getSources({ types: ['window', 'screen'], fetchWindowIcons: true, thumbnailSize: { width: 225, height: 135 } }).then(async sources => { + return sources.map((source: any) => { + return { + ...source, + appIconURL: source.appIcon?.toDataURL(), + thumbnailURL: source.thumbnail.toDataURL() + } + }) + }) + }) + + ipcMain.handle('get-minimize-to-tray-enabled', () => { + return settings.isMinimizeToTrayEnabled() + }) + + async function onReady (): Promise { + await createWindow() + + if (serverChanged) { + mainWindow?.webContents.send('logout') + } + } + + app.on('ready', () => { + void onReady() + }) + + app.on('will-quit', () => { + globalShortcut.unregister(CloseTabHotKey) + }) + + app.on('window-all-closed', () => { + globalShortcut.unregister(CloseTabHotKey) + if (process.platform !== 'darwin') { + app.quit() + } + }) if (isMac) { - mainWindow?.removeAllListeners('close') - mainWindow?.close() - } -}) - -// Note: it is reset when the app is relaunched after update -let isUpdating = false - -autoUpdater.on('update-available', (info: UpdateInfo) => { - if (isUpdating) return - - void dialog - .showMessageBox({ - type: 'info', - buttons: ['Update & Restart', 'Quit'], - defaultId: 0, - message: `A new version ${info.version} is available and it is required to continue. It will be downloaded and installed automatically.` - }) - .then(({ response }: any) => { - log.info(`Update dialog exit code: ${response}`) // eslint-disable-line no-console - - if (response !== 0) { - app.quit() + app.on('activate', () => { + if (mainWindow != null && (mainWindow.isMinimized() || !mainWindow.isVisible())) { + mainWindow.show() } - isUpdating = true - setDownloadProgress(0) }) -}) - -autoUpdater.on('download-progress', (progressObj: ProgressInfo) => { - setDownloadProgress(progressObj.percent) -}) - -function setDownloadProgress (percent: number): void { - if (mainWindow === undefined) { - return } - mainWindow.setProgressBar(percent / 100) - mainWindow.webContents.send('handle-update-download-progress', percent) + app.on('before-quit', () => { + isQuiting = true + + if (mainWindow !== undefined && !mainWindow.isDestroyed()) { + const bounds = mainWindow.getBounds() + settings.setWindowBounds(bounds) + } + + // Note: in case the app is exited by auto-updater all windows will be destroyed at this point + if (mainWindow === undefined || mainWindow.isDestroyed()) { + return + } + + if (isMac) { + mainWindow?.removeAllListeners('close') + mainWindow?.close() + } + }) + + // Note: it is reset when the app is relaunched after update + let isUpdating = false + + autoUpdater.on('update-available', (info: UpdateInfo) => { + if (isUpdating) return + + void dialog + .showMessageBox({ + type: 'info', + buttons: ['Update & Restart', 'Quit'], + defaultId: 0, + message: `A new version ${info.version} is available and it is required to continue. It will be downloaded and installed automatically.` + }) + .then(({ response }: any) => { + log.info(`Update dialog exit code: ${response}`) // eslint-disable-line no-console + + if (response !== 0) { + quitApplication() + } + isUpdating = true + setDownloadProgress(0) + }) + }) + + autoUpdater.on('download-progress', (progressObj: ProgressInfo) => { + setDownloadProgress(progressObj.percent) + }) + + function setDownloadProgress (percent: number): void { + if (mainWindow === undefined) { + return + } + mainWindow.setProgressBar(percent / 100) + mainWindow.webContents.send('handle-update-download-progress', percent) + } + + autoUpdater.on('update-downloaded', (_info: any) => { + // We have listeners that prevents the app from being exited on mac + app.removeAllListeners('window-all-closed') + mainWindow?.removeAllListeners('close') + + autoUpdater.quitAndInstall() + }) } - -autoUpdater.on('update-downloaded', (_info: any) => { - // We have listeners that prevents the app from being exited on mac - app.removeAllListeners('window-all-closed') - mainWindow?.removeAllListeners('close') - - autoUpdater.quitAndInstall() -}) diff --git a/desktop/src/main/tray.ts b/desktop/src/main/tray.ts new file mode 100644 index 0000000000..9529c99d7d --- /dev/null +++ b/desktop/src/main/tray.ts @@ -0,0 +1,133 @@ +// +// Copyright © 2025 Hardcore Engineering Inc. +// +// Licensed under the Eclipse Public License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. You may +// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import { Menu, NativeImage, nativeImage, Tray } from 'electron' +import { WindowAction } from '../ui/types' +import { Settings } from './settings' +import { getFileInPublicBundledFolder } from './path' +import { getBadgeIconInfo } from './trayUtils' + +export class TrayController { + private tray: Tray | undefined = undefined + private readonly defaultIcon: NativeImage + private readonly notificationIcon: NativeImage + private badgeCount: number = 0 + + constructor ( + private readonly settings: Settings, + private readonly activateWindow: WindowAction, + private readonly quitApplication: WindowAction) { + this.defaultIcon = nativeImage.createFromPath(getFileInPublicBundledFolder('AppIcon.ico')) + this.defaultIcon.setTemplateImage(true) + + this.notificationIcon = nativeImage.createFromPath(getFileInPublicBundledFolder('AppIconNotification.png')) + this.notificationIcon.setTemplateImage(true) + + if (this.settings.isMinimizeToTrayEnabled()) { + this.instantiateTray() + } + } + + public updateTrayBadge (count: number): void { + const countChanged = this.badgeCount !== count + this.badgeCount = count + if (!countChanged) { + return + } + + this.evaluateIcon(count) + } + + public setMinimizeToTrayEnabled (enabled: boolean): void { + this.settings.setMinimizeToTrayEnabled(enabled) + if (enabled) { + if (this.tray == null) { + this.instantiateTray() + } + } else { + if (this.tray != null) { + this.tray.destroy() + this.tray = undefined + } + } + } + + public toggleMinimizeToTray (): boolean { + const currentSetting = this.settings.isMinimizeToTrayEnabled() + const newSetting = !currentSetting + this.setMinimizeToTrayEnabled(newSetting) + return newSetting + } + + private instantiateTray (): void { + this.tray = createTray( + () => { this.activateWindow() }, + () => { this.quitApplication() }, + this.defaultIcon + ) + this.evaluateIcon(this.badgeCount) + } + + private evaluateIcon (badgeCount: number): void { + if (this.tray == null) { + return + } + + const iconInfo = getBadgeIconInfo(badgeCount, BASE_TITLE) + if (badgeCount > 0) { + const iconFilePath = getFileInPublicBundledFolder(iconInfo.fileName) + const icon = nativeImage.createFromPath(iconFilePath) + this.tray.setImage(icon) + } else { + this.tray.setImage(this.defaultIcon) + } + + this.tray.setToolTip(iconInfo.tooltip) + } +} + +const BASE_TITLE = 'Huly' + +function createTray (activateWindow: WindowAction, quitApplication: WindowAction, icon: NativeImage): Tray { + const tray = new Tray(icon) + + const contextMenu = Menu.buildFromTemplate([ + { + label: 'Show', + click: () => { + activateWindow() + } + }, + { + label: 'Exit', + click: () => { + quitApplication() + } + } + ]) + + tray.setContextMenu(contextMenu) + tray.setToolTip(BASE_TITLE) + + tray.on('double-click', () => { + activateWindow() + }) + + tray.on('click', (): void => { + activateWindow() + }) + + return tray +} diff --git a/services/msg2file/src/parser.ts b/desktop/src/main/trayUtils.ts similarity index 50% rename from services/msg2file/src/parser.ts rename to desktop/src/main/trayUtils.ts index 9bb223e3d2..b3e50385e4 100644 --- a/services/msg2file/src/parser.ts +++ b/desktop/src/main/trayUtils.ts @@ -13,28 +13,21 @@ // limitations under the License. // -import { Readable } from 'stream' -import { ParsedFile } from '@hcengineering/communication-types' -import { parseYaml } from '@hcengineering/communication-yaml' - -export async function parseFileStream (stream: Readable): Promise { - return await new Promise((resolve, reject) => { - let yamlData = '' - - stream.on('data', (chunk) => { - yamlData += chunk.toString() - }) - - stream.on('end', () => { - try { - resolve(parseYaml(yamlData)) - } catch (error) { - reject(error) - } - }) - - stream.on('error', (error) => { - reject(error) - }) - }) +export interface BadgeIconInfo { + fileName: string + tooltip: string +} + +export function getBadgeIconInfo (badgeCount: number, baseTitle: string): BadgeIconInfo { + if (badgeCount <= 0) { + return { + fileName: '', + tooltip: baseTitle + } + } + + return { + fileName: 'TrayIconWithBadge.ico', + tooltip: `${baseTitle}: ${badgeCount} unread` + } } diff --git a/desktop/src/main/windowsSpecificSetup.ts b/desktop/src/main/windowsSpecificSetup.ts index feb8393425..d62e3ee927 100644 --- a/desktop/src/main/windowsSpecificSetup.ts +++ b/desktop/src/main/windowsSpecificSetup.ts @@ -14,106 +14,103 @@ // import { app, JumpListItem, JumpListCategory } from 'electron' -import { Command, CommandOpenSettings, CommandOpenInbox, CommandOpenApplication, JumpListSpares } from '../ui/types' +import { Command, CommandOpenSettings, CommandOpenInbox, CommandOpenApplication, JumpListSpares, WindowAction, SendCommandDelegate } from '../ui/types' import * as path from 'path' const JUMP_COMMANDS = { INBOX: '--jump-to-inbox', - SETTINGS: '--jump-to-settings', + SETTINGS: '--jump-to-settings' } as const type JumpCommand = typeof JUMP_COMMANDS[keyof typeof JUMP_COMMANDS] const JUMP_TO_APP_COMMAND_PREFIX = '--jump-to-app=' -function getIconPath(iconName: string): string { - return path.join(process.resourcesPath, 'icons', iconName) +function getIconPath (iconName: string): string { + return path.join(process.resourcesPath, 'icons', iconName) } -function addFixedFunctionJumpListItems(spares: JumpListSpares, tasks: JumpListItem[]): void { +function addFixedFunctionJumpListItems (spares: JumpListSpares, tasks: JumpListItem[]): void { + tasks.push({ + type: 'task', + program: process.execPath, + args: JUMP_COMMANDS.SETTINGS, + iconPath: getIconPath('SettingsIcon.ico'), + title: spares.settingsLabel, + iconIndex: 0 + }) + tasks.push({ + type: 'task', + program: process.execPath, + args: JUMP_COMMANDS.INBOX, + iconPath: getIconPath('InboxIcon.ico'), + title: spares.inboxLabel, + iconIndex: 0 + }) +} + +export function rebuildJumpList (spares: JumpListSpares): void { + const tasks: JumpListItem[] = [] + + addFixedFunctionJumpListItems(spares, tasks) + + if (spares.applications.length > 0) { tasks.push({ - type: 'task', - program: process.execPath, - args: JUMP_COMMANDS.SETTINGS, - iconPath: getIconPath('SettingsIcon.ico'), - title: spares.settingsLabel, - iconIndex: 0, + type: 'separator' }) + } + + for (const application of spares.applications) { + const iconFileName = application.id.replaceAll(':', '_') + '.ico' + const cliArguments = `${JUMP_TO_APP_COMMAND_PREFIX}${application.alias}` tasks.push({ - type: 'task', - program: process.execPath, - args: JUMP_COMMANDS.INBOX, - iconPath: getIconPath('InboxIcon.ico'), - title: spares.inboxLabel, - iconIndex: 0, + type: 'task', + program: process.execPath, + args: cliArguments, + iconPath: getIconPath(iconFileName), + title: application.title, + iconIndex: 0 }) + } + + const category: JumpListCategory = { + type: 'tasks', + items: tasks + } + + app.setJumpList([category]) } -export function rebuildJumpList(spares: JumpListSpares): void { - const tasks: JumpListItem[] = []; +export function setupWindowsSpecific (activateWindow: WindowAction, sendCommand: SendCommandDelegate): void { + app.setAppUserModelId(app.getName()) - addFixedFunctionJumpListItems(spares, tasks) - - if (spares.applications.length > 0) { - tasks.push({ - type: 'separator' - }) - } - - for (const application of spares.applications) { - const iconFileName = application.id.replaceAll(":", "_") + '.ico' - const cliArguments = `${JUMP_TO_APP_COMMAND_PREFIX}${application.alias}` - tasks.push({ - type: 'task', - program: process.execPath, - args: cliArguments, - iconPath: getIconPath(iconFileName), - title: application.title, - iconIndex: 0, - }) - } - - const category: JumpListCategory = { - type: 'tasks', - items: tasks, - } - - app.setJumpList([category]) -} - -export function setupWindowsSpecific(activateWindow: () => void, sendCommand: (cmd: Command, ...args: any[]) => void): void { - - app.setAppUserModelId(app.getName()) - - app.on('second-instance', (_event: any, commandLine: any, _workingDirectory: any) => { - const commandArgument = commandLine[1] as string - if (typeof commandArgument === 'string' && commandArgument.startsWith(JUMP_TO_APP_COMMAND_PREFIX)) { - const applicationId = commandArgument.replace(JUMP_TO_APP_COMMAND_PREFIX, '') - sendCommand(CommandOpenApplication, [applicationId]) - - } else { - const jumpCommandCode = commandArgument as JumpCommand - let command: Command | undefined - switch (jumpCommandCode) { - case JUMP_COMMANDS.INBOX: - command = CommandOpenInbox - break; - case JUMP_COMMANDS.SETTINGS: - command = CommandOpenSettings - break; - default: { - // compile-time check: if jumpCommand is not a known value, this line errors - const _exhaustive: never = jumpCommandCode - return; // or handle error - } - } - - if (command) { - sendCommand(command) - } + app.on('second-instance', (_event: any, commandLine: any, _workingDirectory: any) => { + const commandArgument = commandLine[1] as string + if (typeof commandArgument === 'string' && commandArgument.startsWith(JUMP_TO_APP_COMMAND_PREFIX)) { + const applicationId = commandArgument.replace(JUMP_TO_APP_COMMAND_PREFIX, '') + sendCommand(CommandOpenApplication, [applicationId]) + } else { + const jumpCommandCode = commandArgument as JumpCommand + let command: Command | undefined + switch (jumpCommandCode) { + case JUMP_COMMANDS.INBOX: + command = CommandOpenInbox + break + case JUMP_COMMANDS.SETTINGS: + command = CommandOpenSettings + break + default: { + // compile-time check: if jumpCommand is not a known value, this line errors + const _exhaustive: never = jumpCommandCode + break } + } - activateWindow() - }) - -} \ No newline at end of file + if (command !== undefined) { + sendCommand(command) + } + } + + activateWindow() + }) +} diff --git a/desktop/src/ui/index.ts b/desktop/src/ui/index.ts index 9a51e98867..e5ec3d6454 100644 --- a/desktop/src/ui/index.ts +++ b/desktop/src/ui/index.ts @@ -2,7 +2,7 @@ import { loginId } from '@hcengineering/login' import { loveId } from '@hcengineering/love' import { timeId } from '@hcengineering/time' -import { getEmbeddedLabel, getMetadata, translate } from '@hcengineering/platform' +import { getEmbeddedLabel, getMetadata, getResource, translate } from '@hcengineering/platform' import presentation, { MessageBox, setDownloadProgress, getClient } from '@hcengineering/presentation' import setting, { settingId } from '@hcengineering/setting' import { @@ -20,14 +20,14 @@ import { handleDownloadItem } from '@hcengineering/desktop-downloads' import notification, { notificationId } from '@hcengineering/notification' import { chatId } from '@hcengineering/chat' import workbench, { workbenchId, logOut } from '@hcengineering/workbench' -import { encodeObjectURI } from '@hcengineering/view' +import view, { Action, encodeObjectURI } from '@hcengineering/view' import { resolveLocation } from '@hcengineering/notification-resources' -import { isOwnerOrMaintainer, getCurrentAccount } from '@hcengineering/core' +import { isOwnerOrMaintainer, getCurrentAccount, Ref } from '@hcengineering/core' import { configurePlatform } from './platform' import { setupTitleBarMenu } from './titleBarMenu' import { defineScreenShare, defineGetDisplayMedia } from './screenShare' -import { CommandLogout, CommandSelectWorkspace, CommandOpenSettings, CommandOpenInbox, CommandOpenPlanner, CommandOpenOffice, CommandOpenApplication, LaunchApplication, NotificationParams } from './types' +import { CommandLogout, CommandSelectWorkspace, CommandOpenSettings, CommandOpenInbox, CommandOpenPlanner, CommandOpenOffice, CommandOpenApplication, LaunchApplication, NotificationParams, CommandCloseTab } from './types' import { ipcMainExposed } from './typesUtils' import { themeStore, ThemeVariant } from '@hcengineering/theme' import type { Application } from '@hcengineering/workbench' @@ -37,6 +37,19 @@ function currentOsIsWindows (): boolean { return (window as any).windowsPlatform === true } +async function executePlatformAction (action: Ref): Promise { + try { + const client = getClient() + const actions = client.getModel().findAllSync(view.class.Action, { _id: action }) + if (actions.length > 0) { + const actionBody = await getResource(actions[0].action) + await actionBody(undefined) + } + } catch (error) { + console.error('failed to execute platform action', error) + } +} + defineScreenShare() defineGetDisplayMedia() @@ -46,18 +59,18 @@ window.addEventListener('DOMContentLoaded', () => { if (currentOsIsWindows()) { const titleBarRoot = document.getElementById('desktop-app-titlebar-root') if (titleBarRoot != null) { - const menuBar = setupTitleBarMenu(ipcMain, titleBarRoot) + void setupTitleBarMenu(ipcMain, titleBarRoot).then((menuBar) => { + themeStore.subscribe((themeOptions) => { + if (themeOptions != null) { + menuBar.setTheme(themeOptions.variant) + } + }) - themeStore.subscribe((themeOptions) => { - if (themeOptions != null) { - menuBar.setTheme(themeOptions.variant) - } - }) - - void ipcMain.isOsUsingDarkTheme().then((isDarkTheme) => { - menuBar.setTheme(isDarkTheme ? ThemeVariant.Dark : ThemeVariant.Light) - }).catch(() => { - menuBar.setTheme(ThemeVariant.Light) // fallback + void ipcMain.isOsUsingDarkTheme().then((isDarkTheme) => { + menuBar.setTheme(isDarkTheme ? ThemeVariant.Dark : ThemeVariant.Light) + }).catch(() => { + menuBar.setTheme(ThemeVariant.Light) // fallback + }) }) } } @@ -124,6 +137,10 @@ window.addEventListener('DOMContentLoaded', () => { openScreen(loveId) }) + ipcMain.on(CommandCloseTab, () => { + void executePlatformAction(workbench.action.CloseCurrentTab) + }) + ipcMain.on(CommandOpenPlanner, () => { openScreen(timeId) }) diff --git a/desktop/src/ui/platform.ts b/desktop/src/ui/platform.ts index 36570461ff..e7580f8f86 100644 --- a/desktop/src/ui/platform.ts +++ b/desktop/src/ui/platform.ts @@ -298,6 +298,7 @@ export async function configurePlatform (onWorkbenchConnect?: () => Promise Promise l.trim()) : ['en', 'ru', 'es', 'pt', 'zh', 'fr', 'cs', 'it', 'de', 'ja'] + const languages = myBranding.languages !== undefined && myBranding.languages !== '' ? myBranding.languages.split(',').map((l) => l.trim()) : ['en', 'ru', 'es', 'pt', 'zh', 'fr', 'cs', 'it', 'de', 'ja', 'tr'] setMetadata(uiPlugin.metadata.Languages, languages) diff --git a/desktop/src/ui/preload.ts b/desktop/src/ui/preload.ts index d5ea5f61af..a5e324c43c 100644 --- a/desktop/src/ui/preload.ts +++ b/desktop/src/ui/preload.ts @@ -1,7 +1,7 @@ // preload.js import { contextBridge, ipcRenderer } from 'electron' -import { BrandingMap, Config, IPCMainExposed, MenuBarAction, NotificationParams, JumpListSpares } from './types' +import { BrandingMap, Config, IPCMainExposed, JumpListSpares, MenuBarAction, NotificationParams } from './types' /** * @public @@ -18,27 +18,23 @@ export function concatLink (host: string, path: string): string { } async function loadServerConfig (url: string): Promise { - let retries = 5 + let retries = 1 let res: Response | undefined - do { + while (true) { try { res = await fetch(url, { keepalive: true }) + if (res === undefined) { + // In theory should never get here + throw new Error('Failed to load server config') + } break } catch (e) { - retries-- - if (retries === 0) { - throw new Error(`Failed to load server config: ${e}`) - } - await new Promise((resolve) => setTimeout(resolve, 1000 * (5 - retries))) + retries++ + await new Promise((resolve) => setTimeout(resolve, 1000 * Math.min(5, retries))) } - } while (retries > 0) - - if (res === undefined) { - // In theory should never get here - throw new Error('Failed to load server config') } return await res.json() @@ -181,6 +177,13 @@ const expose: IPCMainExposed = { cancelBackup: () => { ipcRenderer.send('cancel-backup') }, startBackup: (token, endpoint, wsIds) => { ipcRenderer.send('start-backup', token, endpoint, wsIds) }, - rebuildJumpList: (spares: JumpListSpares) => { ipcRenderer.send('rebuild-user-jump-list', spares) } + rebuildJumpList: (spares: JumpListSpares) => { ipcRenderer.send('rebuild-user-jump-list', spares) }, + + isMinimizeToTrayEnabled: async () => { + return await ipcRenderer.invoke('get-minimize-to-tray-enabled') + }, + onMinimizeToTraySettingChanged: (callback: (enabled: boolean) => void) => { + ipcRenderer.on('minimize-to-tray-setting-changed', (_event, enabled: boolean) => { callback(enabled) }) + } } contextBridge.exposeInMainWorld('electron', expose) diff --git a/desktop/src/ui/titleBarMenu.ts b/desktop/src/ui/titleBarMenu.ts index f0c5c1987f..6121d38224 100644 --- a/desktop/src/ui/titleBarMenu.ts +++ b/desktop/src/ui/titleBarMenu.ts @@ -18,9 +18,14 @@ import { isMenuBarAction } from './typesUtils' import { TitleBarMenuState } from './titleBarMenuState' import { ThemeVariant, type ThemeVariantType } from '@hcengineering/theme' -export function setupTitleBarMenu (ipcMain: IPCMainExposed, root: HTMLElement): MenuBar { +const ToggleMinimizeToTrayAction: MenuBarAction = 'toggle-minimize-to-tray' + +const LabelMinimizeToTrayEnabled = '☑ Minimize to tray' +const LabelMinimizeToTrayDisabled = '☐ Minimize to tray' + +export async function setupTitleBarMenu (ipcMain: IPCMainExposed, root: HTMLElement): Promise { const themeManager = new ThemeManager(ThemeVariant.Light) - const menuManager = new MenuBarManager(root) + const menuManager = new MenuBarManager(root, await ipcMain.isMinimizeToTrayEnabled()) const menuBar = menuManager.getView() @@ -35,6 +40,13 @@ export function setupTitleBarMenu (ipcMain: IPCMainExposed, root: HTMLElement): menuManager.attachEventListeners(ipcMain) + ipcMain.onMinimizeToTraySettingChanged((enabled) => { + const toggle = root.querySelector(`[data-action="${ToggleMinimizeToTrayAction}"]`) + if (toggle != null) { + toggle.textContent = enabled ? LabelMinimizeToTrayEnabled : LabelMinimizeToTrayDisabled + } + }) + ipcMain.onWindowStateChange((_event, state) => { const maximizeButton = root.querySelector('#maximize-button') if (maximizeButton != null) { @@ -58,7 +70,7 @@ export class MenuBar { } } -export function buildHulyApplicationMenu (): HTMLElement { +export function buildHulyApplicationMenu (minimizeToTrayEnabled: boolean): HTMLElement { const menuBuilder = new MenuBuilder() const MenuFileIndex = 0 @@ -93,6 +105,11 @@ export function buildHulyApplicationMenu (): HTMLElement { .addSeparator(MenuViewIndex) .addMenuItem(MenuViewIndex, 'Toggle Fullscreen', 'toggle-fullscreen', 'F11', 'l') + const MenuWindowIndex = 3 + const ToggleMinimizeToTrayLabel = minimizeToTrayEnabled ? LabelMinimizeToTrayEnabled : LabelMinimizeToTrayDisabled + menuBuilder.addTopLevelMenu('Window', 'w') + .addMenuItem(MenuWindowIndex, ToggleMinimizeToTrayLabel, 'toggle-minimize-to-tray', undefined, 'm') + return menuBuilder.build() } @@ -140,7 +157,7 @@ export class MenuBuilder { label: string, action: MenuBarAction, shortcut?: string, - acceleratorChar: string | null = null + acceleratorChar: string | undefined = undefined ): this { if (topLevelMenuIndex >= 0 && topLevelMenuIndex < this.menus.length) { const item: MenuItem = { @@ -281,7 +298,7 @@ class MenuBarManager { private readonly StateStyleKeyboardSelected = 'desktop-app-keyboard-selected' private readonly StateStyleAltModeActive = 'desktop-app-alt-active' - constructor (private readonly root: HTMLElement) { + constructor (private readonly root: HTMLElement, minimizeToTrayEnabled: boolean) { this.state = new TitleBarMenuState( () => this.topLevelMenus().length, (topLevelMenuIndex: number) => { @@ -290,7 +307,7 @@ class MenuBarManager { } ) - this.view = buildHulyApplicationMenu() + this.view = buildHulyApplicationMenu(minimizeToTrayEnabled) } public getView (): HTMLElement { diff --git a/desktop/src/ui/titleBarMenuState.ts b/desktop/src/ui/titleBarMenuState.ts index ada16d9fdc..dd358c994a 100644 --- a/desktop/src/ui/titleBarMenuState.ts +++ b/desktop/src/ui/titleBarMenuState.ts @@ -14,113 +14,113 @@ // export class TitleBarMenuState { - private altModeActive: boolean = false - private topLevelMenuExpanded: boolean = false - private focusedTopLevelMenuIndex: number | null = null - private focusedChildMenuIndex: number | null = null + private altModeActive: boolean = false + private topLevelMenuExpanded: boolean = false + private focusedTopLevelMenuIndex: number | null = null + private focusedChildMenuIndex: number | null = null - private readonly topLevelMenuCount: () => number; - private readonly menuItemsCount: (topLevelMenuIndex: number) => number; + private readonly topLevelMenuCount: () => number + private readonly menuItemsCount: (topLevelMenuIndex: number) => number - public constructor( - topLevelMenuCount: () => number, - menuItemsCount: (topLevelMenuIndex: number) => number - ) { - this.topLevelMenuCount = topLevelMenuCount - this.menuItemsCount = menuItemsCount + public constructor ( + topLevelMenuCount: () => number, + menuItemsCount: (topLevelMenuIndex: number) => number + ) { + this.topLevelMenuCount = topLevelMenuCount + this.menuItemsCount = menuItemsCount + } + + public focusChildMenu (): void { + if (this.focusedTopLevelMenuIndex != null && this.topLevelMenuExpanded) { + this.focusedChildMenuIndex = 0 + } + } + + public expandTopLevelMenu (topLevelMenuIndex: number): void { + if (topLevelMenuIndex < 0 || topLevelMenuIndex >= this.topLevelMenuCount()) { + return } - public focusChildMenu() { - if (null != this.focusedTopLevelMenuIndex && this.topLevelMenuExpanded) { - this.focusedChildMenuIndex = 0 - } + if (this.focusedTopLevelMenuIndex === topLevelMenuIndex && this.topLevelMenuExpanded) { + this.closeAll() + } else { + this.focusedTopLevelMenuIndex = topLevelMenuIndex + this.topLevelMenuExpanded = true + } + } + + public exitAltMode (): void { + this.altModeActive = false + } + + public enterAltMode (topLevelMenuIndex: number | null): void { + this.altModeActive = true + + if (topLevelMenuIndex == null || topLevelMenuIndex < 0 || topLevelMenuIndex >= this.topLevelMenuCount()) { + return } - public expandTopLevelMenu(topLevelMenuIndex: number): void { - if (0 > topLevelMenuIndex || topLevelMenuIndex >= this.topLevelMenuCount()) { - return - } - - if (this.focusedTopLevelMenuIndex === topLevelMenuIndex && this.topLevelMenuExpanded) { - this.closeAll() - } else { - this.focusedTopLevelMenuIndex = topLevelMenuIndex - this.topLevelMenuExpanded = true - } + this.focusedTopLevelMenuIndex = topLevelMenuIndex + } + + public closeAll (): void { + this.altModeActive = false + this.topLevelMenuExpanded = false + this.focusedTopLevelMenuIndex = null + this.focusedChildMenuIndex = null + } + + public defocus (): void { + if (this.topLevelMenuExpanded) { + this.topLevelMenuExpanded = false + this.focusedChildMenuIndex = null + } else { + this.closeAll() + } + } + + public moveFocusHorizontal (increment: number): void { + if (Math.abs(increment) !== 1 || this.focusedTopLevelMenuIndex == null) { + return } - public exitAltMode(): void { - this.altModeActive = false + const topLevelMenuCount = this.topLevelMenuCount() + this.focusedTopLevelMenuIndex = (this.focusedTopLevelMenuIndex + topLevelMenuCount + increment) % topLevelMenuCount + + if (this.topLevelMenuExpanded) { + this.focusedChildMenuIndex = 0 + } + } + + public moveFocusVertical (increment: number): void { + if (Math.abs(increment) !== 1 || this.focusedTopLevelMenuIndex == null) { + return } - public enterAltMode(topLevelMenuIndex: number | null): void { - this.altModeActive = true - - if (null == topLevelMenuIndex || 0 > topLevelMenuIndex || topLevelMenuIndex >= this.topLevelMenuCount()) { - return - } - - this.focusedTopLevelMenuIndex = topLevelMenuIndex + const menuItemsCount = this.menuItemsCount(this.focusedTopLevelMenuIndex) + + this.topLevelMenuExpanded = true + + if (menuItemsCount === 0) { + return } - public closeAll(): void { - this.altModeActive = false - this.topLevelMenuExpanded = false - this.focusedTopLevelMenuIndex = null - this.focusedChildMenuIndex = null - } + this.focusedChildMenuIndex = ((this.focusedChildMenuIndex ?? -1) + menuItemsCount + increment) % menuItemsCount + } - public defocus(): void { - if (this.topLevelMenuExpanded) { - this.topLevelMenuExpanded = false - this.focusedChildMenuIndex = null - } else { - this.closeAll(); - } - } + public get isAltModeActive (): boolean { + return this.altModeActive + } - public moveFocusHorizontal(increment: number): void { - if (Math.abs(increment) != 1 || null == this.focusedTopLevelMenuIndex) { - return; - } - - const topLevelMenuCount = this.topLevelMenuCount() - this.focusedTopLevelMenuIndex = (this.focusedTopLevelMenuIndex + topLevelMenuCount + increment) % topLevelMenuCount - - if (this.topLevelMenuExpanded) { - this.focusedChildMenuIndex = 0 - } - } + public get isTopLevelMenuExpanded (): boolean { + return this.topLevelMenuExpanded + } - public moveFocusVertical(increment: number): void { - if (Math.abs(increment) != 1 || null == this.focusedTopLevelMenuIndex) { - return; - } + public get FocusedTopLevelMenuIndex (): number | null { + return this.focusedTopLevelMenuIndex + } - const menuItemsCount = this.menuItemsCount(this.focusedTopLevelMenuIndex) - - this.topLevelMenuExpanded = true - - if (menuItemsCount === 0) { - return; - } - - this.focusedChildMenuIndex = ((this.focusedChildMenuIndex ?? -1) + menuItemsCount + increment) % menuItemsCount - } - - public get isAltModeActive(): boolean { - return this.altModeActive - } - - public get isTopLevelMenuExpanded(): boolean { - return this.topLevelMenuExpanded - } - - public get FocusedTopLevelMenuIndex(): number | null { - return this.focusedTopLevelMenuIndex - } - - public get FocusedChildMenuIndex(): number | null { - return this.focusedChildMenuIndex - } -} \ No newline at end of file + public get FocusedChildMenuIndex (): number | null { + return this.focusedChildMenuIndex + } +} diff --git a/desktop/src/ui/types.ts b/desktop/src/ui/types.ts index 1543e00dbd..0888fdb1a0 100644 --- a/desktop/src/ui/types.ts +++ b/desktop/src/ui/types.ts @@ -56,6 +56,7 @@ export interface Config { PULSE_URL?: string PASSWORD_STRICTNESS?: 'very_strict' | 'strict' | 'normal' | 'none' EXCLUDED_APPLICATIONS_FOR_ANONYMOUS?: string + HULYLAKE_URL?: string } export interface Branding { @@ -84,6 +85,7 @@ export const CommandOpenPlanner = 'open-planner' as const export const CommandSelectWorkspace = 'select-workspace' as const export const CommandLogout = 'logout' as const export const CommandOpenApplication = 'open-application' as const +export const CommandCloseTab = 'close-tab' as const export type Command = typeof CommandOpenSettings | @@ -92,7 +94,8 @@ export type Command = typeof CommandOpenPlanner | typeof CommandSelectWorkspace | typeof CommandLogout | - typeof CommandOpenApplication + typeof CommandOpenApplication | + typeof CommandCloseTab export interface NotificationParams { title: string @@ -104,8 +107,26 @@ export interface NotificationParams { objectClass?: Ref> } -export const MenuBarActions = ['settings', 'select-workspace', 'logout', 'exit', 'undo', 'redo', 'cut', 'copy', 'paste', 'delete', 'select-all', 'reload', 'force-reload', 'toggle-devtools', - 'zoom-in', 'zoom-out', 'restore-size', 'toggle-fullscreen'] as const +export const MenuBarActions = [ + 'settings', + 'select-workspace', + 'logout', + 'exit', + 'undo', + 'redo', + 'cut', + 'copy', + 'paste', + 'delete', + 'select-all', + 'reload', + 'force-reload', + 'toggle-devtools', + 'zoom-in', + 'zoom-out', + 'restore-size', + 'toggle-fullscreen', + 'toggle-minimize-to-tray'] as const export type MenuBarAction = typeof MenuBarActions[number] @@ -151,4 +172,10 @@ export interface IPCMainExposed { executeMenuBarAction: (action: MenuBarAction) => void rebuildJumpList: (spares: JumpListSpares) => void + + isMinimizeToTrayEnabled: () => Promise + onMinimizeToTraySettingChanged: (callback: (enabled: boolean) => void) => void } + +export type SendCommandDelegate = (cmd: Command, ...args: any[]) => void +export type WindowAction = () => void diff --git a/desktop/start-dev.ps1 b/desktop/start-dev.ps1 index 94bbd625f5..aad3d20939 100644 --- a/desktop/start-dev.ps1 +++ b/desktop/start-dev.ps1 @@ -1,11 +1,9 @@ -$MODEL_VERSION = node ../common/scripts/show_version.js | Out-String -$MODEL_VERSION = $MODEL_VERSION.Trim() - -$VERSION = node ../common/scripts/show_tag.js | Out-String -$VERSION = $VERSION.Trim() - -# Set environment variable -$env:NODE_ENV = "development" - -# Run Electron -electron --no-sandbox ./ \ No newline at end of file +$MODEL_VERSION = node ../common/scripts/show_version.js | Out-String +$MODEL_VERSION = $MODEL_VERSION.Trim() + +$VERSION = node ../common/scripts/show_tag.js | Out-String +$VERSION = $VERSION.Trim() + +$env:NODE_ENV = "development" + +electron --no-sandbox ./ diff --git a/dev/docker-compose.min.yaml b/dev/docker-compose.min.yaml index 7f57288aae..955d91bb67 100644 --- a/dev/docker-compose.min.yaml +++ b/dev/docker-compose.min.yaml @@ -236,7 +236,6 @@ services: - LAST_NAME_FIRST=true - BRANDING_PATH=/var/cfg/branding.json - AI_BOT_URL=http://huly.local:4010 - - MSG2FILE_URL=http://huly.local:9087 - COMMUNICATION_TIME_LOGGING_ENABLED=true restart: unless-stopped fulltext_cockroach: @@ -285,6 +284,22 @@ services: - DB_URL=${DB_CR_URL} - BUCKETS=blobs,eu|http://minio:9000?accessKey=minioadmin&secretKey=minioadmin restart: unless-stopped + redis: + image: redis:8.0.2-alpine3.21 + ports: + - 6379:6379 + restart: unless-stopped + hulypulse: + image: hardcoreeng/hulypulse + depends_on: + redis: + condition: service_started + ports: + - 8099:8099 + environment: + - HULY_REDIS_URLS=redis://redis:6379 + - HULY_BIND_PORT=8099 + restart: unless-stopped volumes: db: dbpg: diff --git a/dev/docker-compose.yaml b/dev/docker-compose.yaml index 1e1317f460..42ba98f2dc 100644 --- a/dev/docker-compose.yaml +++ b/dev/docker-compose.yaml @@ -286,6 +286,7 @@ services: # - DISABLE_SIGNUP=true - OTEL_EXPORTER_OTLP_ENDPOINT=http://jaeger:4318/v1/traces - PULSE_URL=ws://huly.local:8099/ws + - HULYLAKE_URL=http://huly.local:8096 restart: unless-stopped transactor_cockroach: image: hardcoreeng/transactor @@ -321,13 +322,13 @@ services: - LAST_NAME_FIRST=true - BRANDING_PATH=/var/cfg/branding.json - AI_BOT_URL=http://huly.local:4010 - - MSG2FILE_URL=http://huly.local:9087 - COMMUNICATION_TIME_LOGGING_ENABLED=true - RATE_LIMIT_MAX=250 # 250 requests per 30 seconds - RATE_LIMIT_WINDOW=30000 - FILES_URL=http://huly.local:4030/blob/:workspace/:blobId/:filename - COMMUNICATION_API_ENABLED=true - OTEL_EXPORTER_OTLP_ENDPOINT=http://jaeger:4318/v1/traces + - HYLYLAKE_URL=http://huly.local:8096 restart: unless-stopped rekoni: image: hardcoreeng/rekoni-service @@ -366,6 +367,7 @@ services: - REKONI_URL=http://huly.local:4004 - ACCOUNTS_URL=http://huly.local:3000 - OTEL_EXPORTER_OTLP_ENDPOINT=http://jaeger:4318/v1/traces + - HULYLAKE_URL=http://huly.local:8096 print: image: hardcoreeng/print extra_hosts: @@ -440,21 +442,6 @@ services: # - POSTHOG_HOST=${POSTHOG_HOST} # - POSTHOG_API_KEY=${POSTHOG_API_KEY} # - MAX_PAYLOAD_SIZE=10mb - msg2file: - image: hardcoreeng/msg2file - ports: - - 9087:9087 - extra_hosts: - - 'huly.local:host-gateway' - restart: unless-stopped - environment: - - ACCOUNTS_URL=http://huly.local:3000 - - DB_URL=postgresql://root@huly.local:26257/defaultdb?sslmode=disable - - PORT=9087 - - SECRET=secret - - SERVICE_ID=msg2file-service - - STORAGE_CONFIG=${STORAGE_CONFIG} - - OTEL_EXPORTER_OTLP_ENDPOINT=http://jaeger:4318/v1/traces export: image: hardcoreeng/export extra_hosts: diff --git a/dev/prod/public/config.json b/dev/prod/public/config.json index eb8b80f1be..2c17577b86 100644 --- a/dev/prod/public/config.json +++ b/dev/prod/public/config.json @@ -28,5 +28,6 @@ "COMMUNICATION_API_ENABLED": "true", "BACKUP_URL": "http://huly.local:4039/api/backup", "PULSE_URL": "ws://huly.local:8099/ws", + "HULYLAKE_URL": "http://huly.local:8096", "EXCLUDED_APPLICATIONS_FOR_ANONYMOUS": "[\"chunter\", \"notification\"]" } diff --git a/dev/prod/src/platform.ts b/dev/prod/src/platform.ts index 2e8490e115..c8a9a099b8 100644 --- a/dev/prod/src/platform.ts +++ b/dev/prod/src/platform.ts @@ -201,7 +201,8 @@ export interface Config { COMMUNICATION_API_ENABLED?: string BILLING_URL?: string, EXCLUDED_APPLICATIONS_FOR_ANONYMOUS?: string, - PULSE_URL?: string + PULSE_URL?: string, + HULYLAKE_URL?: string } export interface Branding { @@ -491,10 +492,11 @@ export async function configurePlatform() { setMetadata(billingPlugin.metadata.BillingURL, config.BILLING_URL ?? '') setMetadata(presentation.metadata.PulseUrl, config.PULSE_URL) + setMetadata(presentation.metadata.HulylakeUrl, config.HULYLAKE_URL ?? '') const languages = myBranding.languages ? (myBranding.languages as string).split(',').map((l) => l.trim()) - : ['en', 'ru', 'es', 'pt', 'zh', 'fr', 'cs', 'it', 'de', 'ja'] + : ['en', 'ru', 'es', 'pt', 'zh', 'fr', 'cs', 'it', 'de', 'ja', 'tr'] setMetadata(uiPlugin.metadata.Languages, languages) diff --git a/dev/tool/package.json b/dev/tool/package.json index a41b6a7e8d..1b585041fc 100644 --- a/dev/tool/package.json +++ b/dev/tool/package.json @@ -21,7 +21,7 @@ "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/tool staging", "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/tool", "run-local-mongo": "rush bundle --to @hcengineering/tool >/dev/null && cross-env SERVER_SECRET=secret FULLTEXT_URL=http://localhost:4700 ACCOUNTS_URL=http://localhost:3000 TRANSACTOR_URL=ws://localhost:3333 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost ACCOUNT_DB_URL=mongodb://localhost:27017 DB_URL=mongodb://localhost:27017 TELEGRAM_DATABASE=telegram-service REKONI_URL=http://localhost:4004 MODEL_VERSION=$(node ../../common/scripts/show_version.js) GIT_REVISION=$(git describe --all --long) QUEUE_CONFIG='localhost:19092' node --expose-gc --max-old-space-size=18000 ./bundle/bundle.js", - "run-local": "rush bundle --to @hcengineering/tool >/dev/null && cross-env SERVER_SECRET=secret FULLTEXT_URL=http://localhost:4702 ACCOUNTS_URL=http://localhost:3000 TRANSACTOR_URL=ws://localhost:3332 STORAGE_CONFIG='datalake|http://huly.local:4030' ACCOUNT_DB_URL=postgresql://root@huly.local:26257/defaultdb?sslmode=disable DB_URL=postgresql://root@huly.local:26257/defaultdb?sslmode=disable TELEGRAM_DATABASE=telegram-service REKONI_URL=http://localhost:4004 REGION_INFO='cockroach|CockroachDB' MODEL_VERSION=$(node ../../common/scripts/show_version.js) GIT_REVISION=$(git describe --all --long) QUEUE_CONFIG='localhost:19092' node --expose-gc --max-old-space-size=18000 $TOOL_OPT ./bundle/bundle.js", + "run-local": "rush bundle --to @hcengineering/tool >/dev/null && cross-env SERVER_SECRET=secret FULLTEXT_URL=http://localhost:4702 ACCOUNTS_URL=http://localhost:3000 TRANSACTOR_URL=ws://localhost:3332 STORAGE_CONFIG='datalake|http://huly.local:4030' HULYLAKE_URL=http://huly.local:8096 ACCOUNT_DB_URL=postgresql://root@huly.local:26257/defaultdb?sslmode=disable DB_URL=postgresql://root@huly.local:26257/defaultdb?sslmode=disable TELEGRAM_DATABASE=telegram-service REKONI_URL=http://localhost:4004 REGION_INFO='cockroach|CockroachDB' MODEL_VERSION=$(node ../../common/scripts/show_version.js) GIT_REVISION=$(git describe --all --long) QUEUE_CONFIG='localhost:19092' node --expose-gc --max-old-space-size=18000 $TOOL_OPT ./bundle/bundle.js", "run-local-brk": "rush bundle --to @hcengineering/tool >/dev/null && cross-env SERVER_SECRET=secret ACCOUNTS_URL=http://localhost:3000 TRANSACTOR_URL=ws://localhost:3333 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost ACCOUNT_DB_URL=mongodb://localhost:27017 DB_URL=mongodb://localhost:27017 TELEGRAM_DATABASE=telegram-service REKONI_URL=http://localhost:4004 MODEL_VERSION=$(node ../../common/scripts/show_version.js) GIT_REVISION=$(git describe --all --long) node --inspect-brk --enable-source-maps --max-old-space-size=18000 ./bundle/bundle.js", "run": "rush bundle --to @hcengineering/tool >/dev/null && cross-env node --max-old-space-size=8000 ./bundle/bundle.js", "upgrade-mongo": "rushx run-local-mongo upgrade-workspace -- $1", @@ -55,7 +55,8 @@ "@types/request": "~2.48.8", "jest": "^29.7.0", "ts-jest": "^29.1.1", - "@types/jest": "^29.5.5" + "@types/jest": "^29.5.5", + "@types/js-yaml": "^4.0.9" }, "dependencies": { "@elastic/elasticsearch": "^7.17.14", @@ -180,6 +181,8 @@ "msgpackr-extract": "^3.0.3", "@hcengineering/kafka": "^0.6.0", "@hcengineering/api-client": "^0.6.0", - "@faker-js/faker": "^8.4.1" + "@faker-js/faker": "^8.4.1", + "@hcengineering/hulylake-client": "^0.6.0", + "@hcengineering/communication-types": "^0.1.0" } } diff --git a/dev/tool/src/communication.ts b/dev/tool/src/communication.ts new file mode 100644 index 0000000000..312095a7e7 --- /dev/null +++ b/dev/tool/src/communication.ts @@ -0,0 +1,895 @@ +// Copyright © 2025 Hardcore Engineering Inc. +// +// Licensed under the Eclipse Public License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. You may +// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. + +import { type Workspace } from '@hcengineering/account' +import { type HulylakeClient, type JsonPatch } from '@hcengineering/hulylake-client' +import type postgres from 'postgres' +import { + generateUuid, + groupByArray, + type MeasureContext, + notEmpty, + type PersonId, + type PersonUuid, + type WorkspaceUuid +} from '@hcengineering/core' +import { + type Attachment, + type AttachmentData, + type AttachmentDoc, + type AttachmentID, + type AttachmentUpdateData, + type BlobID, + type CardID, + type CardType, + type Emoji, + type Markdown, + type MessageDoc, + type MessageExtra, + type MessageID, + type MessagesDoc, + type MessagesGroup, + type MessagesGroupDoc, + type MessagesGroupsDoc, + MessageType, + type SocialID, + type ThreadDoc +} from '@hcengineering/communication-types' +import { type AccountClient } from '@hcengineering/account-client' + +const MAX_MESSAGES_SIZE = 95 * 1024 + +const MESSAGES_TABLE = 'communication.message' +const PATCH_TABLE = 'communication.patch' +const ATTACHMENT_TABLE = 'communication.attachment' +const REACTION_TABLE = 'communication.reaction' +const THREAD_INDEX_TABLE = 'communication.thread_index' + +export async function migrateWorkspaceMessages ( + ctx: MeasureContext, + ws: Workspace, + card: CardID | undefined, + db: postgres.Sql, + hulylake: HulylakeClient, + accountClient: AccountClient, + personUuidBySocialId: Map +): Promise { + await migrateMessages(ctx, ws, card, db, hulylake, accountClient, personUuidBySocialId) +} + +async function migrateMessages ( + ctx: MeasureContext, + ws: Workspace, + card: CardID | undefined, + db: postgres.Sql, + hulylake: HulylakeClient, + accountClient: AccountClient, + personUuidBySocialId: Map +): Promise { + const force = card != null && card !== '' + const cards = card != null && card !== '' ? [card] : await getMessagesCards(ws.uuid, db) + ctx.info(`Cards for migration: ${cards.length}, force: ${force}`) + let i = 0 + for (const card of cards) { + try { + i++ + const groups = await getGroups(ctx, hulylake, card) + const lastGroup = groups[groups.length - 1] + + ctx.info(`Migrating messages for card ${card} index ${i} from ${lastGroup?.toDate?.toISOString() ?? 'null'}`) + const cursor = getMessagesCursor(ws.uuid, card, db, force ? undefined : lastGroup?.toDate) + + for await (const messages of cursor) { + ctx.info(`Messages count ${messages.length}`) + if (messages.length === 0) continue + const oldMessages = messages.map(deserializeOldMessage).filter(notEmpty) + await migrateMessagesBatch(ctx, card, hulylake, accountClient, personUuidBySocialId, oldMessages) + } + } catch (e) { + ctx.error('Failed to migrate messages for card', card) + ctx.error('Error', { error: e }) + } + } +} + +async function migrateMessagesBatch ( + ctx: MeasureContext, + cardId: CardID, + hulylake: HulylakeClient, + accountClient: AccountClient, + personUuidBySocialId: Map, + messages: OldMessage[] +): Promise { + const newMessages: MessageDoc[] = [] + for (const oldMessage of messages) { + const newMessageDoc = await oldMessageToNewMessageDoc(oldMessage, accountClient, personUuidBySocialId) + newMessages.push(newMessageDoc) + } + const chunks = chunkMessagesBySize(ctx, newMessages) + for (const chunk of chunks) { + const fromDate = chunk.from + const toDate = chunk.to + const blobId = generateUuid() as BlobID + const newGroupDoc: MessagesGroupDoc = { + cardId, + blobId, + fromDate: fromDate.toISOString(), + toDate: toDate.toISOString(), + count: chunk.count + } + const newMessagesDoc: MessagesDoc = { + cardId, + fromDate: fromDate.toISOString(), + toDate: toDate.toISOString(), + messages: chunk.chunk, + language: 'original' + } + + const jsonPatches: JsonPatch[] = [ + { + hop: 'add', + path: `/${blobId}`, + value: newGroupDoc, + safe: true + } as const + ] + + await hulylake.patchJson(`${cardId}/messages/groups`, jsonPatches, undefined, { + maxRetries: 3, + isRetryable: () => true, + delayStrategy: { + getDelay: () => 1000 + } + }) + await hulylake.putJson(`${cardId}/messages/${blobId}`, newMessagesDoc, undefined, { + maxRetries: 3, + isRetryable: () => true, + delayStrategy: { + getDelay: () => 1000 + } + }) + } +} + +async function getGroups (ctx: MeasureContext, hulylake: HulylakeClient, cardId: CardID): Promise { + const res = await hulylake.getJson(`${cardId}/messages/groups`, { + maxRetries: 3, + isRetryable: () => true, + delayStrategy: { + getDelay: () => 500 + } + }) + if (res.body != null) { + return deserializeMessagesGroups(res.body) + } + + await hulylake.putJson(`${cardId}/messages/groups`, {}, undefined, { + maxRetries: 3, + isRetryable: () => true, + delayStrategy: { + getDelay: () => 1000 + } + }) + return [] +} + +function chunkMessagesBySize ( + ctx: MeasureContext, + messages: MessageDoc[] +): Array<{ chunk: Record, from: Date, to: Date, count: number }> { + const chunks: Array<{ chunk: Record, from: Date, to: Date, count: number }> = [] + + let current: { chunk: Record, from?: Date, to?: Date, count: number } = { + chunk: {}, + count: 0 + } + + for (const msg of messages) { + current.chunk[msg.id] = msg + + if (sizeOfJson(current.chunk) <= MAX_MESSAGES_SIZE) { + const d = new Date(msg.created) + current.count += 1 + current.from = current.from != null ? (d < current.from ? d : current.from) : d + current.to = current.to != null ? (d > current.to ? d : current.to) : d + continue + } + + // eslint-disable-next-line @typescript-eslint/no-dynamic-delete + delete current.chunk[msg.id] + + if (sizeOfJson(msg) > MAX_MESSAGES_SIZE) { + ctx.warn('Message size is too big, skipping') + continue + } + + if (Object.keys(current.chunk).length === 0) { + ctx.warn('Message size is too big, skipping') + continue + } + + if (current.from != null && current.to != null) { + chunks.push({ + chunk: current.chunk, + from: current.from, + to: current.to, + count: current.count + }) + } + + current = { + chunk: {}, + count: 0 + } + current.chunk[msg.id] = msg + + if (sizeOfJson(current.chunk) <= MAX_MESSAGES_SIZE) { + const d = new Date(msg.created) + current.from = current.from != null ? (d < current.from ? d : current.from) : d + current.to = current.to != null ? (d > current.to ? d : current.to) : d + current.count = 1 + } else { + // eslint-disable-next-line @typescript-eslint/no-dynamic-delete + delete current.chunk[msg.id] + ctx.warn(`Message ${msg.id} still exceeds limit, skipping`) + } + } + + if (current.from != null && current.to != null) { + chunks.push({ + chunk: current.chunk, + from: current.from, + to: current.to, + count: current.count + }) + } + + return chunks +} + +async function oldMessageToNewMessageDoc ( + oldMessage: OldMessage, + accountClient: AccountClient, + personUuidBySocialId: Map +): Promise { + const reactions: Record> = {} + const attachments: Record = {} + const threads: Record = {} + + const reactionsByEmoji = groupByArray(oldMessage.reactions, (it) => it.reaction) + for (const [_emoji, oldReactions] of reactionsByEmoji.entries()) { + const emoji = _emoji as Emoji + if (reactions[emoji] == null) { + reactions[emoji] = {} + } + for (const oldReaction of oldReactions) { + const personUuid = await getPersonUuidBySocialId(accountClient, personUuidBySocialId, oldReaction.creator) + + if (personUuid == null) continue + if (reactions[emoji][personUuid] == null) { + reactions[emoji][personUuid] = { + count: 1, + date: oldReaction.created.toISOString() + } + } + } + } + + for (const oldAttachment of oldMessage.attachments) { + attachments[oldAttachment.id] = { + id: oldAttachment.id, + mimeType: + oldAttachment.mimeType ?? + (oldAttachment as any)?.params?.mimeType ?? + (oldAttachment as any).type ?? + (oldAttachment as any)?.params?.type ?? + '', + params: oldAttachment.params, + creator: oldAttachment.creator, + created: oldAttachment.created.toISOString(), + modified: oldAttachment.modified?.toISOString() ?? null + } + } + + if (oldMessage.thread != null) { + threads[oldMessage.thread.threadId] = { + threadId: oldMessage.thread.threadId, + threadType: oldMessage.thread.threadType, + repliesCount: oldMessage.thread.repliesCount, + lastReplyDate: oldMessage.thread.lastReply?.toISOString() ?? null, + repliedPersons: {} + } + } + return { + id: oldMessage.id, + cardId: oldMessage.cardId, + type: oldMessage.type === 'activity' ? MessageType.Activity : MessageType.Text, + content: oldMessage.content, + extra: oldMessage.extra ?? {}, + creator: oldMessage.creator, + created: oldMessage.created.toISOString(), + modified: oldMessage.edited?.toISOString() ?? null, + reactions, + attachments, + threads + } +} + +function sizeOfJson (obj: unknown): number { + return Buffer.byteLength(JSON.stringify(obj), 'utf8') +} + +async function getPersonUuidBySocialId ( + ccountClient: AccountClient, + personUuidBySocialId: Map, + socialId: PersonId +): Promise { + if (personUuidBySocialId.has(socialId)) { + return personUuidBySocialId.get(socialId) + } + const personUuid = await ccountClient.findPersonBySocialId(socialId) + if (personUuid != null) { + personUuidBySocialId.set(socialId, personUuid) + } + + return personUuid +} + +async function getMessagesCards (ws: WorkspaceUuid, db: postgres.Sql): Promise { + const table = db(MESSAGES_TABLE) + const res = await db` + SELECT DISTINCT card_id + FROM ${table} + WHERE workspace_id = ${ws} + ` + + return res.map((r) => r.card_id) +} + +function getMessagesCursor ( + ws: WorkspaceUuid, + cardId: CardID, + db: postgres.Sql, + from?: Date +): AsyncIterable { + const messagesTable = db(MESSAGES_TABLE) + const threadIndexTable = db(THREAD_INDEX_TABLE) + const attachmentTable = db(ATTACHMENT_TABLE) + const reactionTable = db(REACTION_TABLE) + const patchTable = db(PATCH_TABLE) + + return db`WITH + limited_messages AS ( + SELECT * + FROM ${messagesTable} m + WHERE m.workspace_id = ${ws} + AND m.card_id = ${cardId} + ${from != null ? db`AND m.created > ${from}` : db``} + ORDER BY m.created ASC + ), + + agg_attachments AS ( + SELECT + a.workspace_id, + a.card_id, + a.message_id, + jsonb_agg(jsonb_build_object( + 'id', a.id, + 'type', a.type, + 'params', a.params, + 'creator', a.creator, + 'created', a.created, + 'modified', a.modified + )) AS attachments + FROM ${attachmentTable} a + INNER JOIN limited_messages m + ON m.workspace_id = a.workspace_id + AND m.card_id = a.card_id + AND m.id = a.message_id + GROUP BY a.workspace_id, a.card_id, a.message_id + ), + + agg_reactions AS ( + SELECT + r.workspace_id, + r.card_id, + r.message_id, + jsonb_agg(jsonb_build_object( + 'reaction', r.reaction, + 'creator', r.creator, + 'created', r.created + )) AS reactions + FROM ${reactionTable} r + INNER JOIN limited_messages m + ON m.workspace_id = r.workspace_id + AND m.card_id = r.card_id + AND m.id = r.message_id + GROUP BY r.workspace_id, r.card_id, r.message_id + ), + + agg_patches AS ( + SELECT + p.workspace_id, + p.card_id, + p.message_id, + jsonb_agg( + jsonb_build_object( + 'type', p.type, + 'data', p.data, + 'creator', p.creator, + 'created', p.created + ) ORDER BY p.created ASC + ) AS patches + FROM ${patchTable} p + INNER JOIN limited_messages m + ON m.workspace_id = p.workspace_id + AND m.card_id = p.card_id + AND m.id = p.message_id + GROUP BY p.workspace_id, p.card_id, p.message_id + ) + + SELECT m.id::text, + m.card_id, + m.type, + m.content, + m.creator, + m.created, + m.data, + t.thread_id AS thread_id, + t.thread_type AS thread_type, + t.replies_count::int AS replies_count, + t.last_reply AS last_reply, + COALESCE(a.attachments, '[]'::jsonb) AS attachments, + COALESCE(r.reactions, '[]'::jsonb) AS reactions, + COALESCE(p.patches, '[]'::jsonb) AS patches + FROM limited_messages m + LEFT JOIN ${threadIndexTable} t + ON t.workspace_id = m.workspace_id + AND t.card_id = m.card_id + AND t.message_id = m.id + LEFT JOIN agg_attachments a + ON a.workspace_id = m.workspace_id + AND a.card_id = m.card_id + AND a.message_id = m.id + LEFT JOIN agg_reactions r + ON r.workspace_id = m.workspace_id + AND r.card_id = m.card_id + AND r.message_id = m.id + LEFT JOIN agg_patches p + ON p.workspace_id = m.workspace_id + AND p.card_id = m.card_id + AND p.message_id = m.id + ORDER BY m.created ASC;`.cursor(200) +} + +function deserializeMessagesGroups (groups: MessagesGroupsDoc): MessagesGroup[] { + return Object.values(groups) + .map((group) => { + const g: MessagesGroup = { + cardId: group.cardId, + blobId: group.blobId, + fromDate: new Date(group.fromDate), + toDate: new Date(group.toDate), + count: Number(group.count) + } + + return g + }) + .sort((a, b) => a.fromDate.getTime() - b.fromDate.getTime()) +} + +function deserializePatch (raw: any): Patch { + return { + type: raw.type, + messageId: String(raw.message_id) as MessageID, + data: raw.data, + creator: raw.creator, + created: new Date(raw.created) + } +} + +function deserializeOldMessage (raw: any): OldMessage | undefined { + const patches: Patch[] = (raw.patches ?? []).map((it: any) => deserializePatch(it)) + const rawMessage: OldMessage = { + id: String(raw.id) as MessageID, + type: raw.type, + cardId: raw.card_id, + content: raw.content, + creator: raw.creator, + created: new Date(raw.created), + removed: false, + extra: raw.data, + thread: + raw.thread_id != null && raw.thread_type != null + ? { + cardId: raw.card_id, + messageId: String(raw.id) as MessageID, + threadId: raw.thread_id, + threadType: raw.thread_type, + repliesCount: raw.replies_count != null ? Number(raw.replies_count) : 0, + lastReply: raw.last_reply ?? new Date() + } + : undefined, + reactions: (raw.reactions ?? []).map(deserializeReaction), + attachments: (raw.attachments ?? []).map(deserializeAttachment) + } + + if (patches.length === 0) { + return rawMessage + } + + return applyPatches( + rawMessage, + patches.filter((it) => it.type === PatchType.update || it.type === PatchType.remove) + ) +} + +function deserializeReaction (raw: any): OldReaction { + return { + reaction: raw.reaction, + creator: raw.creator, + created: new Date(raw.created) + } +} + +function deserializeAttachment (raw: any): Attachment { + return { + id: String(raw.id) as AttachmentID, + type: raw.type, + params: raw.params, + creator: raw.creator, + created: new Date(raw.created), + modified: raw.modified != null ? new Date(raw.modified) : undefined + } as any as Attachment +} + +export function applyPatches (message: OldMessage, patches: Patch[]): OldMessage | undefined { + if (patches.length === 0) return message + + let result: OldMessage | undefined = message + for (const p of patches) { + result = applyPatch(message, p) + } + return result +} + +function applyPatch (message: OldMessage, patch: Patch): OldMessage | undefined { + if (message.removed) { + return undefined + } + + switch (patch.type) { + case PatchType.update: { + if (patch.created.getTime() < (message.edited?.getTime() ?? 0)) { + return message + } + return { + ...message, + edited: patch.created, + content: patch.data.content ?? message.content, + extra: patch.data.extra ?? message.extra + } + } + case PatchType.remove: { + return undefined + } + case PatchType.reaction: + return patchReactions(message, patch) + case PatchType.attachment: + return patchAttachments(message, patch) + case PatchType.thread: + return patchThread(message, patch) + } +} + +function patchAttachments (message: OldMessage, patch: AttachmentPatch): OldMessage { + if (patch.data.operation === 'add') { + return addAttachments(message, patch.data.attachments, patch.created, patch.creator) + } else if (patch.data.operation === 'remove') { + return removeAttachments(message, patch.data.ids) + } else if (patch.data.operation === 'set') { + return setAttachments(message, patch.data.attachments, patch.created, patch.creator) + } else if (patch.data.operation === 'update') { + return updateAttachments(message, patch.data.attachments, patch.created) + } + return message +} + +function patchReactions (message: OldMessage, patch: ReactionPatch): OldMessage { + if (patch.data.operation === 'add') { + return setReaction(message, patch.data.reaction, patch.creator, patch.created) + } else if (patch.data.operation === 'remove') { + return removeReaction(message, patch.data.reaction, patch.creator) + } + return message +} + +function setReaction (message: OldMessage, reaction: string, creator: SocialID, created: Date): OldMessage { + const isExist = message.reactions.some((it) => it.reaction === reaction && it.creator === creator) + if (isExist) return message + message.reactions.push({ + reaction, + creator, + created + }) + return message +} + +function removeReaction (message: OldMessage, reaction: string, creator: SocialID): OldMessage { + const reactions = message.reactions.filter((it) => it.reaction !== reaction || it.creator !== creator) + if (reactions.length === message.reactions.length) return message + + return { + ...message, + reactions + } +} + +function addAttachments (message: OldMessage, data: AttachmentData[], created: Date, creator: SocialID): OldMessage { + const newAttachments: Attachment[] = [] + for (const attach of data) { + const isExists = message.attachments.some((it) => it.id === attach.id) + if (isExists === undefined) continue + const attachment: Attachment = { + ...attach, + created, + creator + } as any + newAttachments.push(attachment) + } + + if (newAttachments.length === 0) return message + return { + ...message, + attachments: [...message.attachments, ...newAttachments] + } +} + +function updateAttachments (message: OldMessage, updates: AttachmentUpdateData[], date: Date): OldMessage { + if (updates.length === 0) return message + const updatedAttachments: Attachment[] = [] + for (const attachment of message.attachments) { + const update = updates.find((it) => it.id === attachment.id) + if (update === undefined) { + updatedAttachments.push(attachment) + } else { + updatedAttachments.push({ + ...attachment, + params: { + ...attachment.params, + ...update.params + }, + modified: date.getTime() > (attachment.modified?.getTime() ?? 0) ? date : attachment.modified + } as any) + } + } + + return { + ...message, + attachments: updatedAttachments + } +} + +function removeAttachments (message: OldMessage, ids: AttachmentID[]): OldMessage { + const attachments = message.attachments.filter((it) => !ids.includes(it.id)) + if (attachments.length === message.attachments.length) return message + + return { + ...message, + attachments + } +} + +function setAttachments (message: OldMessage, data: AttachmentData[], created: Date, creator: SocialID): OldMessage { + if (data.length === 0) return message + return { + ...message, + attachments: data.map( + (it) => + ({ + ...it, + created, + creator + }) as any + ) + } +} + +function patchThread (message: OldMessage, patch: ThreadPatch): OldMessage { + if (patch.data.operation === 'attach') { + return attachThread(message, patch.data.threadId, patch.data.threadType) + } else if (patch.data.operation === 'update') { + return updateThread( + message, + patch.data.threadId, + patch.data.threadType, + patch.data.repliesCountOp, + patch.data.lastReply + ) + } + return message +} + +function attachThread (message: OldMessage, threadId: CardID, threadType: CardType): OldMessage { + if (message.thread !== undefined) return message + return { + ...message, + thread: { + cardId: message.cardId, + messageId: message.id, + threadId, + threadType, + repliesCount: 0, + lastReply: new Date() + } + } +} + +function updateThread ( + message: OldMessage, + threadId: CardID, + threadType?: CardType, + repliesCountOp?: 'increment' | 'decrement', + lastReply?: Date +): OldMessage { + if (repliesCountOp === undefined && lastReply === undefined) return message + if (message.thread === undefined) return message + if (message.thread.threadId !== threadId) return message + + let count = message.thread.repliesCount + if (repliesCountOp === 'increment') { + count = count + 1 + } + + if (repliesCountOp === 'decrement') { + count = Math.max(count - 1, 0) + } + + return { + ...message, + thread: { + ...message.thread, + repliesCount: count, + threadType: threadType ?? message.thread.threadType, + lastReply: lastReply ?? message.thread.lastReply + } + } +} + +interface OldMessage { + id: MessageID + cardId: CardID + type: 'message' | 'activity' + content: Markdown + extra?: MessageExtra + creator: SocialID + created: Date + + removed: boolean + edited?: Date + + reactions: OldReaction[] + attachments: Attachment[] + thread?: OldThread +} + +interface OldReaction { + reaction: string + creator: SocialID + created: Date +} + +interface OldThread { + cardId: CardID + messageId: MessageID + threadId: CardID + threadType: CardType + repliesCount: number + lastReply: Date +} + +type Patch = UpdatePatch | RemovePatch | ReactionPatch | ThreadPatch | AttachmentPatch + +enum PatchType { + update = 'update', + remove = 'remove', + reaction = 'reaction', + attachment = 'attachment', + thread = 'thread' +} + +interface BasePatch { + messageId: MessageID + type: PatchType + creator: SocialID + created: Date + + data: Record +} + +interface UpdatePatch extends BasePatch { + type: PatchType.update + data: UpdatePatchData +} + +interface UpdatePatchData { + content?: Markdown + extra?: MessageExtra +} + +interface RemovePatch extends BasePatch { + type: PatchType.remove + data: RemovePatchData +} + +// eslint-disable-next-line @typescript-eslint/no-empty-interface +interface RemovePatchData {} + +interface ReactionPatch extends BasePatch { + type: PatchType.reaction + data: AddReactionPatchData | RemoveReactionPatchData +} + +interface AddReactionPatchData { + operation: 'add' + reaction: string +} + +interface RemoveReactionPatchData { + operation: 'remove' + reaction: string +} + +interface AttachmentPatch extends BasePatch { + type: PatchType.attachment + data: AddAttachmentsPatchData | RemoveAttachmentsPatchData | SetAttachmentsPatchData | UpdateAttachmentsPatchData +} + +interface AddAttachmentsPatchData { + operation: 'add' + attachments: AttachmentData[] +} + +interface RemoveAttachmentsPatchData { + operation: 'remove' + ids: AttachmentID[] +} + +interface SetAttachmentsPatchData { + operation: 'set' + attachments: AttachmentData[] +} + +interface UpdateAttachmentsPatchData { + operation: 'update' + attachments: AttachmentUpdateData[] +} + +interface ThreadPatch extends BasePatch { + type: PatchType.thread + data: AttachThreadPatchData | UpdateThreadPatchData +} + +interface AttachThreadPatchData { + operation: 'attach' + threadId: CardID + threadType: CardType +} + +interface UpdateThreadPatchData { + operation: 'update' + threadId: CardID + threadType?: CardType + repliesCountOp?: 'increment' | 'decrement' + lastReply?: Date +} diff --git a/dev/tool/src/db.ts b/dev/tool/src/db.ts index 37b9c4d672..201489a6f9 100644 --- a/dev/tool/src/db.ts +++ b/dev/tool/src/db.ts @@ -1911,7 +1911,7 @@ export async function restoreTrustedV6Workspace ( url } - const queue = getPlatformQueue('tool', workspace.region) + const queue = getPlatformQueue('tool', region) const wsProducer = queue.getProducer(ctx, QueueTopic.Workspace) await wsProducer.send(ctx, uuid, [workspaceEvents.restoring()]) diff --git a/dev/tool/src/index.ts b/dev/tool/src/index.ts index 1126d9886c..4e88e4a7e4 100644 --- a/dev/tool/src/index.ts +++ b/dev/tool/src/index.ts @@ -56,6 +56,14 @@ import { type Account as OldAccount, type Workspace as OldWorkspace } from '@hcengineering/account-service' +import { getClient as getHulylakeClient } from '@hcengineering/hulylake-client' +import { + getDBClient, + createPostgreeDestroyAdapter, + createPostgresAdapter, + createPostgresTxAdapter, + shutdownPostgres +} from '@hcengineering/postgres' import { faker } from '@faker-js/faker' import { getPlatformQueue } from '@hcengineering/kafka' @@ -69,6 +77,7 @@ import { isDeletingMode, MeasureMetricsContext, metricsToString, + SocialId, SocialIdType, systemAccountEmail, systemAccountUuid, @@ -80,7 +89,8 @@ import { type Tx, type Version, type WorkspaceDataId, - type WorkspaceUuid + type WorkspaceUuid, + type PersonUuid } from '@hcengineering/core' import { consoleModelLogger, type MigrateOperation } from '@hcengineering/model' import { @@ -92,12 +102,6 @@ import { } from '@hcengineering/mongo' import { getModelVersion } from '@hcengineering/model-all' -import { - createPostgreeDestroyAdapter, - createPostgresAdapter, - createPostgresTxAdapter, - shutdownPostgres -} from '@hcengineering/postgres' import { QueueTopic, workspaceEvents, @@ -131,6 +135,8 @@ import { mkdir, writeFile } from 'fs/promises' import { dirname } from 'path' import { restoreMarkupRefs } from './markup' import { restoreGithubIntegrations } from './restoreGithub' +import { migrateWorkspaceMessages } from './communication' +import { type CardID } from '@hcengineering/communication-types' const colorConstants = { colorRed: '\u001b[31m', @@ -2845,6 +2851,54 @@ export function devTool ( }, dbUrl) }) + program + .command('migrate-communication-to-hulylake ') + .description('Migrate communication messages to hulylake') + .option('-c, --card ', 'Card to migrate') + .action(async (workspace: WorkspaceUuid, cmd: { card?: CardID }) => { + const { dbUrl } = prepareTools() + const hulylakeUrl = process.env.HULYLAKE_URL ?? '' + + console.log('Workspace', workspace) + console.log('Card', cmd.card) + if (hulylakeUrl === '') { + throw new Error('HULYLAKE_URL should be specified') + } + + const token = generateToken(systemAccountUuid, undefined, { + service: 'tool' + }) + const db = getDBClient(dbUrl, undefined, 'tool') + const dbClient = await db.getClient() + const accountClient = getAccountClient(token) + const personUuidBySocialId = new Map() + + await withAccountDatabase(async (accountDb) => { + const ws = (await accountDb.workspace.find({ uuid: workspace }))[0] + if (ws === undefined) { + throw new Error(`Workspace ${workspace} not found`) + } + try { + const hulylake = getHulylakeClient(hulylakeUrl, ws.uuid, token) + console.log('start workspace migration', ws.name) + await migrateWorkspaceMessages( + toolCtx.newChild(ws.name, {}), + ws, + cmd.card, + dbClient, + hulylake, + accountClient, + personUuidBySocialId + ) + console.log('done workspace migration', ws.name) + } catch (err: any) { + console.error('failed to migrate workspace', ws.name) + console.error(err) + } + db.close() + }, dbUrl) + }) + extendProgram?.(program) process.on('unhandledRejection', (reason, promise) => { diff --git a/models/all/src/index.ts b/models/all/src/index.ts index 5b82ed2d90..b056719d9f 100644 --- a/models/all/src/index.ts +++ b/models/all/src/index.ts @@ -474,7 +474,7 @@ export default function buildModel (): Builder { [ chatModel, chatId, - { label: chat.string.Chat, hidden: true, enabled: false, beta: true, classFilter: defaultFilter } + { label: chat.string.Chat, hidden: false, enabled: true, beta: true, classFilter: defaultFilter } ], [achievementModel, achievementId], [emojiModel, emojiId], diff --git a/models/card/src/actions.ts b/models/card/src/actions.ts new file mode 100644 index 0000000000..f66c26fbc1 --- /dev/null +++ b/models/card/src/actions.ts @@ -0,0 +1,218 @@ +// Copyright © 2025 Hardcore Engineering Inc. +// +// Licensed under the Eclipse Public License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. You may +// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. + +import { type Builder } from '@hcengineering/model' +import presentation from '@hcengineering/model-presentation' +import setting from '@hcengineering/model-setting' +import view, { createAction } from '@hcengineering/model-view' +import workbench from '@hcengineering/model-workbench' +import card from './plugin' + +export function createActions (builder: Builder): void { + createAction(builder, { + action: card.actionImpl.EditSpace, + label: presentation.string.Edit, + icon: view.icon.Edit, + input: 'focus', + category: view.category.General, + target: card.class.CardSpace, + visibilityTester: view.function.CanEditSpace, + query: {}, + context: { + mode: ['context', 'browser'], + group: 'edit' + } + }) + + createAction(builder, { + action: view.actionImpl.CopyTextToClipboard, + actionProps: { + textProvider: card.function.GetSpaceAccessPublicLink + }, + label: card.string.GetIndividualPublicLink, + icon: view.icon.CopyLink, + input: 'any', + category: view.category.General, + target: card.class.CardSpace, + query: {}, + visibilityTester: card.function.CanGetSpaceAccessPublicLink, + context: { + mode: ['context', 'browser'] + } + }) + + createAction( + builder, + { + action: view.actionImpl.ShowPopup, + actionProps: { + component: card.component.SetParentActionPopup, + element: 'top', + fillProps: { + _objects: 'value' + } + }, + label: card.string.SetParent, + icon: card.icon.MasterTag, + input: 'none', + category: card.category.Card, + target: card.class.Card, + context: { + mode: ['context'], + application: card.app.Card, + group: 'associate' + } + }, + card.action.SetParent + ) + + createAction( + builder, + { + action: view.actionImpl.UpdateDocument, + actionProps: { + key: 'parent', + value: null + }, + query: { + parent: { $ne: null, $exists: true } + }, + label: card.string.UnsetParent, + icon: card.icon.MasterTag, + input: 'none', + category: card.category.Card, + target: card.class.Card, + context: { + mode: ['context'], + application: card.app.Card, + group: 'associate' + } + }, + card.action.UnsetParent + ) + + createAction(builder, { + action: view.actionImpl.ShowPopup, + actionProps: { + component: card.component.CreateTag, + props: { + _class: card.class.Tag + }, + fillProps: { + _object: 'parent' + } + }, + label: card.string.CreateTag, + input: 'focus', + icon: view.icon.Add, + category: setting.category.Settings, + target: card.class.MasterTag, + context: { + mode: ['context', 'browser'], + group: 'edit' + } + }) + + createAction(builder, { + action: view.actionImpl.ShowPopup, + actionProps: { + component: card.component.CreateTag, + props: { + _class: card.class.Tag + }, + fillProps: { + _object: 'parent' + } + }, + label: card.string.CreateTag, + input: 'focus', + icon: view.icon.Add, + category: setting.category.Settings, + target: card.class.Tag, + context: { + mode: ['context', 'browser'], + group: 'edit' + } + }) + + createAction( + builder, + { + action: card.actionImpl.DeleteMasterTag, + label: workbench.string.Delete, + icon: view.icon.Delete, + input: 'any', + category: view.category.General, + target: card.class.MasterTag, + context: { + mode: ['context', 'browser'], + group: 'remove' + } + }, + card.action.DeleteMasterTag + ) + + createAction(builder, { + action: card.actionImpl.DeleteMasterTag, + label: workbench.string.Delete, + icon: view.icon.Delete, + input: 'any', + category: view.category.General, + target: card.class.Tag, + context: { + mode: ['context', 'browser'], + group: 'remove' + } + }) + + createAction(builder, { + action: view.actionImpl.ShowPopup, + actionProps: { + component: card.component.ChangeType, + fillProps: { + _object: 'value' + } + }, + label: card.string.ChangeType, + input: 'focus', + icon: card.icon.MasterTag, + category: setting.category.Settings, + target: card.class.Card, + context: { + mode: ['context', 'browser'], + group: 'edit' + } + }) + + createAction(builder, { + action: view.actionImpl.ShowPopup, + actionProps: { + component: card.component.CreateTag, + props: { + _class: card.class.MasterTag + }, + fillProps: { + _object: 'parent' + } + }, + label: card.string.CreateMasterTag, + input: 'focus', + icon: card.icon.MasterTag, + category: setting.category.Settings, + target: card.class.MasterTag, + context: { + mode: ['context', 'browser'], + group: 'edit' + } + }) +} diff --git a/models/card/src/index.ts b/models/card/src/index.ts index baec78eff0..d46e1fbd96 100644 --- a/models/card/src/index.ts +++ b/models/card/src/index.ts @@ -13,6 +13,7 @@ import activity from '@hcengineering/activity' import { + type CanCreateCardResource, type Card, cardId, type CardNavigation, @@ -20,7 +21,6 @@ import { type CardSpace, type CardViewDefaults, type CreateCardExtension, - type CanCreateCardResource, DOMAIN_CARD, type FavoriteCard, type MasterTag, @@ -60,17 +60,18 @@ import { import attachment from '@hcengineering/model-attachment' import { TAttachedDoc, TClass, TDoc, TMixin, TSpace } from '@hcengineering/model-core' import { createPublicLinkAction } from '@hcengineering/model-guest' +import preference, { TPreference } from '@hcengineering/model-preference' import presentation from '@hcengineering/model-presentation' import setting from '@hcengineering/model-setting' -import view, { createAction, type Viewlet } from '@hcengineering/model-view' +import view, { type Viewlet } from '@hcengineering/model-view' import workbench, { WidgetType } from '@hcengineering/model-workbench' import { type Asset, getEmbeddedLabel, type IntlString, type Resource } from '@hcengineering/platform' import time, { type ToDo } from '@hcengineering/time' +import { PaletteColorIndexes } from '@hcengineering/ui/src/colors' import { type AnyComponent } from '@hcengineering/ui/src/types' import { type BuildModelKey } from '@hcengineering/view' -import preference, { TPreference } from '@hcengineering/model-preference' import card from './plugin' -import { PaletteColorIndexes } from '@hcengineering/ui/src/colors' +import { createActions } from './actions' export { cardId } from '@hcengineering/card' @@ -399,37 +400,7 @@ export function createModel (builder: Builder): void { } }) - createAction(builder, { - action: card.actionImpl.EditSpace, - label: presentation.string.Edit, - icon: view.icon.Edit, - input: 'focus', - category: view.category.General, - target: card.class.CardSpace, - visibilityTester: view.function.CanEditSpace, - query: {}, - context: { - mode: ['context', 'browser'], - group: 'edit' - } - }) - - createAction(builder, { - action: view.actionImpl.CopyTextToClipboard, - actionProps: { - textProvider: card.function.GetSpaceAccessPublicLink - }, - label: card.string.GetIndividualPublicLink, - icon: view.icon.CopyLink, - input: 'any', - category: view.category.General, - target: card.class.CardSpace, - query: {}, - visibilityTester: card.function.CanGetSpaceAccessPublicLink, - context: { - mode: ['context', 'browser'] - } - }) + createActions(builder) builder.mixin(card.class.CardSpace, core.class.Class, workbench.mixin.SpaceView, { view: { @@ -450,6 +421,19 @@ export function createModel (builder: Builder): void { locationDataResolver: card.resolver.LocationData, navigatorModel: { specials: [ + { + id: 'all', + label: card.string.AllCards, + icon: card.icon.All, + component: workbench.component.SpecialView, + componentProps: { + _class: card.class.Card, + icon: card.icon.All, + label: card.string.AllCards, + defaultViewletDescriptor: card.viewlet.CardFeedDescriptor + }, + position: 'top' + }, { id: 'browser', label: core.string.Spaces, @@ -484,31 +468,6 @@ export function createModel (builder: Builder): void { presenter: card.component.SpacePresenter }) - createAction( - builder, - { - action: view.actionImpl.ShowPopup, - actionProps: { - component: card.component.SetParentActionPopup, - element: 'top', - fillProps: { - _objects: 'value' - } - }, - label: card.string.SetParent, - icon: card.icon.MasterTag, - input: 'none', - category: card.category.Card, - target: card.class.Card, - context: { - mode: ['context'], - application: card.app.Card, - group: 'associate' - } - }, - card.action.SetParent - ) - builder.mixin(card.class.Card, core.class.Class, view.mixin.AttributeEditor, { inlineEditor: card.component.CardEditor }) @@ -517,31 +476,6 @@ export function createModel (builder: Builder): void { inlineEditor: card.component.CardArrayEditor }) - createAction( - builder, - { - action: view.actionImpl.UpdateDocument, - actionProps: { - key: 'parent', - value: null - }, - query: { - parent: { $ne: null, $exists: true } - }, - label: card.string.UnsetParent, - icon: card.icon.MasterTag, - input: 'none', - category: card.category.Card, - target: card.class.Card, - context: { - mode: ['context'], - application: card.app.Card, - group: 'associate' - } - }, - card.action.UnsetParent - ) - builder.createDoc( view.class.Viewlet, core.space.Model, @@ -680,50 +614,6 @@ export function createModel (builder: Builder): void { encode: card.function.GetCardLink }) - createAction(builder, { - action: view.actionImpl.ShowPopup, - actionProps: { - component: card.component.CreateTag, - props: { - _class: card.class.Tag - }, - fillProps: { - _object: 'parent' - } - }, - label: card.string.CreateTag, - input: 'focus', - icon: view.icon.Add, - category: setting.category.Settings, - target: card.class.MasterTag, - context: { - mode: ['context', 'browser'], - group: 'edit' - } - }) - - createAction(builder, { - action: view.actionImpl.ShowPopup, - actionProps: { - component: card.component.CreateTag, - props: { - _class: card.class.Tag - }, - fillProps: { - _object: 'parent' - } - }, - label: card.string.CreateTag, - input: 'focus', - icon: view.icon.Add, - category: setting.category.Settings, - target: card.class.Tag, - context: { - mode: ['context', 'browser'], - group: 'edit' - } - }) - builder.mixin(card.class.MasterTag, core.class.Class, view.mixin.IgnoreActions, { actions: [setting.action.CreateMixin, view.action.OpenInNewTab, view.action.Delete, setting.action.DeleteMixin] }) @@ -732,77 +622,6 @@ export function createModel (builder: Builder): void { actions: [setting.action.CreateMixin, view.action.OpenInNewTab, view.action.Delete, setting.action.DeleteMixin] }) - createAction( - builder, - { - action: card.actionImpl.DeleteMasterTag, - label: workbench.string.Delete, - icon: view.icon.Delete, - input: 'any', - category: view.category.General, - target: card.class.MasterTag, - context: { - mode: ['context', 'browser'], - group: 'remove' - } - }, - card.action.DeleteMasterTag - ) - - createAction(builder, { - action: card.actionImpl.DeleteMasterTag, - label: workbench.string.Delete, - icon: view.icon.Delete, - input: 'any', - category: view.category.General, - target: card.class.Tag, - context: { - mode: ['context', 'browser'], - group: 'remove' - } - }) - - createAction(builder, { - action: view.actionImpl.ShowPopup, - actionProps: { - component: card.component.ChangeType, - fillProps: { - _object: 'value' - } - }, - label: card.string.ChangeType, - input: 'focus', - icon: card.icon.MasterTag, - category: setting.category.Settings, - target: card.class.Card, - context: { - mode: ['context', 'browser'], - group: 'edit' - } - }) - - createAction(builder, { - action: view.actionImpl.ShowPopup, - actionProps: { - component: card.component.CreateTag, - props: { - _class: card.class.MasterTag - }, - fillProps: { - _object: 'parent' - } - }, - label: card.string.CreateMasterTag, - input: 'focus', - icon: card.icon.MasterTag, - category: setting.category.Settings, - target: card.class.MasterTag, - context: { - mode: ['context', 'browser'], - group: 'edit' - } - }) - builder.createDoc( setting.class.WorkspaceSettingCategory, core.space.Model, @@ -849,6 +668,10 @@ export function createModel (builder: Builder): void { forceIndex: true }) + builder.mixin(card.class.Card, core.class.Class, view.mixin.ObjectFactory, { + create: card.function.CardFactory + }) + builder.createDoc( presentation.class.ObjectSearchCategory, core.space.Model, diff --git a/models/communication/src/actions.ts b/models/communication/src/actions.ts index 53ea42dd85..6d1802b7dd 100644 --- a/models/communication/src/actions.ts +++ b/models/communication/src/actions.ts @@ -36,7 +36,7 @@ export function buildMessageActions (builder: Builder): void { communication.class.MessageAction, core.space.Model, { - label: communication.string.ReplyInThread, + label: communication.string.Reply, icon: communication.icon.MessageMultiple, action: communication.messageActionImpl.ReplyInThread, visibilityTester: communication.function.CanReplyInThread, diff --git a/models/contact/src/index.ts b/models/contact/src/index.ts index 84f69c7092..70459acd78 100644 --- a/models/contact/src/index.ts +++ b/models/contact/src/index.ts @@ -921,6 +921,10 @@ export function createModel (builder: Builder): void { presenter: contact.component.PersonPresenter }) + builder.mixin(contact.class.SocialIdentity, core.class.Class, view.mixin.ObjectPresenter, { + presenter: contact.component.SocialIdentityPresenter + }) + builder.mixin(core.class.TypeAccountUuid, core.class.Class, view.mixin.ArrayEditor, { inlineEditor: contact.component.AccountArrayEditor }) @@ -1141,6 +1145,7 @@ export function createModel (builder: Builder): void { label: contact.string.MergePersons, category: contact.category.Contact, target: contact.class.Person, + visibilityTester: contact.function.CanMergePersons, input: 'focus', context: { mode: ['context'], diff --git a/models/contact/src/plugin.ts b/models/contact/src/plugin.ts index 73122a5076..74eaacf87c 100644 --- a/models/contact/src/plugin.ts +++ b/models/contact/src/plugin.ts @@ -32,6 +32,7 @@ export default mergeIds(contactId, contact, { }, component: { PersonPresenter: '' as AnyComponent, + SocialIdentityPresenter: '' as AnyComponent, ContactRefPresenter: '' as AnyComponent, ContactPresenter: '' as AnyComponent, EditPerson: '' as AnyComponent, diff --git a/models/controlled-documents/src/permissions.ts b/models/controlled-documents/src/permissions.ts index 3aa0db34bb..34bc585581 100644 --- a/models/controlled-documents/src/permissions.ts +++ b/models/controlled-documents/src/permissions.ts @@ -12,6 +12,7 @@ export function definePermissions (builder: Builder): void { core.space.Model, { label: documents.string.ReviewDocumentPermission, + scope: 'space', description: documents.string.ReviewDocumentDescription }, documents.permission.ReviewDocument @@ -22,6 +23,7 @@ export function definePermissions (builder: Builder): void { core.space.Model, { label: documents.string.ApproveDocumentPermission, + scope: 'space', description: documents.string.ApproveDocumentDescription }, documents.permission.ApproveDocument @@ -32,6 +34,7 @@ export function definePermissions (builder: Builder): void { core.space.Model, { label: documents.string.ArchiveDocumentPermission, + scope: 'space', description: documents.string.ArchiveDocumentDescription }, documents.permission.ArchiveDocument @@ -42,6 +45,7 @@ export function definePermissions (builder: Builder): void { core.space.Model, { label: documents.string.CoAuthorDocumentPermission, + scope: 'space', description: documents.string.CoAuthorDocumentDescription }, documents.permission.CoAuthorDocument @@ -52,6 +56,7 @@ export function definePermissions (builder: Builder): void { core.space.Model, { label: documents.string.CreateDocumentPermission, + scope: 'space', description: documents.string.CreateDocumentDescription }, documents.permission.CreateDocument @@ -62,6 +67,7 @@ export function definePermissions (builder: Builder): void { core.space.Model, { label: documents.string.UpdateDocumentOwnerPermission, + scope: 'space', description: documents.string.UpdateDocumentOwnerDescription }, documents.permission.UpdateDocumentOwner @@ -72,6 +78,7 @@ export function definePermissions (builder: Builder): void { core.space.Model, { label: documents.string.CreateDocumentCategoryPermission, + scope: 'space', description: documents.string.CreateDocumentCategoryDescription }, documents.permission.CreateDocumentCategory @@ -82,6 +89,7 @@ export function definePermissions (builder: Builder): void { core.space.Model, { label: documents.string.UpdateDocumentCategoryPermission, + scope: 'space', description: documents.string.UpdateDocumentCategoryDescription }, documents.permission.UpdateDocumentCategory @@ -92,6 +100,7 @@ export function definePermissions (builder: Builder): void { core.space.Model, { label: documents.string.DeleteDocumentCategoryPermission, + scope: 'space', description: documents.string.DeleteDocumentCategoryDescription }, documents.permission.DeleteDocumentCategory diff --git a/models/core/src/permissions.ts b/models/core/src/permissions.ts index 6bb0c0e00b..3c731d1f3d 100644 --- a/models/core/src/permissions.ts +++ b/models/core/src/permissions.ts @@ -23,6 +23,7 @@ export function definePermissions (builder: Builder): void { core.space.Model, { label: core.string.CreateObject, + scope: 'space', description: core.string.CreateObjectDescription }, core.permission.CreateObject @@ -33,6 +34,7 @@ export function definePermissions (builder: Builder): void { core.space.Model, { label: core.string.UpdateObject, + scope: 'space', description: core.string.UpdateObjectDescription }, core.permission.UpdateObject @@ -43,6 +45,7 @@ export function definePermissions (builder: Builder): void { core.space.Model, { label: core.string.DeleteObject, + scope: 'space', description: core.string.DeleteObjectDescription }, core.permission.DeleteObject @@ -53,36 +56,20 @@ export function definePermissions (builder: Builder): void { core.space.Model, { label: core.string.ForbidDeleteObject, + txClass: core.class.TxRemoveDoc, + forbid: true, + scope: 'space', description: core.string.ForbidDeleteObjectDescription }, core.permission.ForbidDeleteObject ) - builder.createDoc( - core.class.Permission, - core.space.Model, - { - label: core.string.UpdateObject, - description: core.string.UpdateObjectDescription - }, - core.permission.UpdateObject - ) - - builder.createDoc( - core.class.Permission, - core.space.Model, - { - label: core.string.DeleteObject, - description: core.string.DeleteObjectDescription - }, - core.permission.DeleteObject - ) - builder.createDoc( core.class.Permission, core.space.Model, { label: core.string.UpdateSpace, + scope: 'space', description: core.string.UpdateSpaceDescription }, core.permission.UpdateSpace @@ -93,6 +80,7 @@ export function definePermissions (builder: Builder): void { core.space.Model, { label: core.string.ArchiveSpace, + scope: 'space', description: core.string.ArchiveSpaceDescription }, core.permission.ArchiveSpace diff --git a/models/core/src/security.ts b/models/core/src/security.ts index 54234e3009..3225d2de6c 100644 --- a/models/core/src/security.ts +++ b/models/core/src/security.ts @@ -29,7 +29,9 @@ import { type SpaceTypeDescriptor, type TypedSpace, type AccountUuid, - type TxAccessLevel + type TxAccessLevel, + type Tx, + type Doc } from '@hcengineering/core' import { ArrOf, @@ -155,6 +157,10 @@ export class TRole extends TAttachedDoc implements Role { @UX(core.string.Permission) export class TPermission extends TDoc implements Permission { label!: IntlString + txClass?: Ref> + forbid?: boolean + objectClass?: Ref>> + scope?: 'space' | 'workspace' description?: IntlString icon?: Asset } diff --git a/models/document/src/index.ts b/models/document/src/index.ts index 024909f6ca..ea38b9d755 100644 --- a/models/document/src/index.ts +++ b/models/document/src/index.ts @@ -63,6 +63,7 @@ import { type Asset, getEmbeddedLabel } from '@hcengineering/platform' import tags from '@hcengineering/tags' import time, { type ToDo, type Todoable } from '@hcengineering/time' import document from './plugin' +import { definePermissions } from './permissions' export { documentId } from '@hcengineering/document' @@ -550,6 +551,7 @@ export function createModel (builder: Builder): void { defineDocument(builder) defineApplication(builder) + definePermissions(builder) builder.createDoc(core.class.DomainIndexConfiguration, core.space.Model, { domain: DOMAIN_DOCUMENT, diff --git a/models/document/src/permissions.ts b/models/document/src/permissions.ts new file mode 100644 index 0000000000..210b0d6624 --- /dev/null +++ b/models/document/src/permissions.ts @@ -0,0 +1,19 @@ +import type { Builder } from '@hcengineering/model' +import core from '@hcengineering/core' +import document from '@hcengineering/document' + +export function definePermissions (builder: Builder): void { + builder.createDoc( + core.class.Permission, + core.space.Model, + { + label: document.string.ForbidCreateTeamspacePermission, + scope: 'workspace', + txClass: core.class.TxCreateDoc, + objectClass: document.class.Teamspace, + forbid: true, + description: document.string.ForbidCreateTeamspacePermissionDescription + }, + document.permission.ForbidCreateTeamspace + ) +} diff --git a/models/drive/src/index.ts b/models/drive/src/index.ts index e44badf673..68171798fd 100644 --- a/models/drive/src/index.ts +++ b/models/drive/src/index.ts @@ -63,6 +63,7 @@ import workbench from '@hcengineering/model-workbench' import { getEmbeddedLabel } from '@hcengineering/platform' import drive from './plugin' +import { definePermissions } from './permissions' export { driveId } from '@hcengineering/drive' export { driveOperation } from './migration' @@ -790,4 +791,5 @@ export function createModel (builder: Builder): void { defineFile(builder) defineFileVersion(builder) defineApplication(builder) + definePermissions(builder) } diff --git a/models/drive/src/permissions.ts b/models/drive/src/permissions.ts new file mode 100644 index 0000000000..89b28e7f09 --- /dev/null +++ b/models/drive/src/permissions.ts @@ -0,0 +1,19 @@ +import type { Builder } from '@hcengineering/model' +import core from '@hcengineering/core' +import drive from '@hcengineering/drive' + +export function definePermissions (builder: Builder): void { + builder.createDoc( + core.class.Permission, + core.space.Model, + { + label: drive.string.ForbidCreateDrivePermission, + scope: 'workspace', + txClass: core.class.TxCreateDoc, + objectClass: drive.class.Drive, + forbid: true, + description: drive.string.ForbidCreateDrivePermissionDescription + }, + drive.permission.ForbidCreateDrive + ) +} diff --git a/models/lead/src/index.ts b/models/lead/src/index.ts index 84d37b56c9..849dd26bb6 100644 --- a/models/lead/src/index.ts +++ b/models/lead/src/index.ts @@ -32,6 +32,7 @@ import { type ViewOptionsModel } from '@hcengineering/view' import lead from './plugin' import { defineSpaceType } from './spaceType' +import { definePermissions } from './permissions' import { TCustomer, TFunnel, TLead } from './types' export { leadId } from '@hcengineering/lead' @@ -660,4 +661,5 @@ export function createModel (builder: Builder): void { }) defineSpaceType(builder) + definePermissions(builder) } diff --git a/models/lead/src/permissions.ts b/models/lead/src/permissions.ts new file mode 100644 index 0000000000..afb8d5287d --- /dev/null +++ b/models/lead/src/permissions.ts @@ -0,0 +1,19 @@ +import type { Builder } from '@hcengineering/model' +import core from '@hcengineering/core' +import lead from '@hcengineering/lead' + +export function definePermissions (builder: Builder): void { + builder.createDoc( + core.class.Permission, + core.space.Model, + { + label: lead.string.ForbidCreateFunnelPermission, + scope: 'workspace', + txClass: core.class.TxCreateDoc, + objectClass: lead.class.Funnel, + forbid: true, + description: lead.string.ForbidCreateFunnelPermissionDescription + }, + lead.permission.ForbidCreateFunnel + ) +} diff --git a/models/love/src/index.ts b/models/love/src/index.ts index b185597208..775e5d556b 100644 --- a/models/love/src/index.ts +++ b/models/love/src/index.ts @@ -719,6 +719,12 @@ export function createModel (builder: Builder): void { love.completion.MeetingMinutesCategory ) + // Extensions + builder.createDoc(presentation.class.ComponentPointExtension, core.space.Model, { + extension: contact.extension.EmployeePopupActions, + component: love.component.InviteEmployeeButton + }) + createAttributePresenter( builder, view.component.DateTimePresenter, diff --git a/models/love/src/plugin.ts b/models/love/src/plugin.ts index e7ef324548..1c54922679 100644 --- a/models/love/src/plugin.ts +++ b/models/love/src/plugin.ts @@ -32,7 +32,8 @@ export default mergeIds(loveId, love, { WidgetSwitcher: '' as AnyComponent, RoomLanguageEditor: '' as AnyComponent, MediaPopupItemExt: '' as AnyComponent, - SharingStateIndicator: '' as AnyComponent + SharingStateIndicator: '' as AnyComponent, + InviteEmployeeButton: '' as AnyComponent }, app: { Love: '' as Ref diff --git a/models/process/package.json b/models/process/package.json index d2fde4d349..56935986c0 100644 --- a/models/process/package.json +++ b/models/process/package.json @@ -45,6 +45,7 @@ "@hcengineering/setting": "^0.6.17", "@hcengineering/model-time": "^0.6.0", "@hcengineering/rank": "^0.6.4", + "@hcengineering/notification": "^0.6.23", "@hcengineering/process": "^0.6.0", "@hcengineering/process-resources": "^0.6.0", "@hcengineering/model-presentation": "^0.6.0", diff --git a/models/process/src/actions.ts b/models/process/src/actions.ts new file mode 100644 index 0000000000..4fa5a49ec1 --- /dev/null +++ b/models/process/src/actions.ts @@ -0,0 +1,118 @@ +// Copyright © 2025 Hardcore Engineering Inc. +// +// Licensed under the Eclipse Public License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. You may +// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. + +import card from '@hcengineering/card' +import core from '@hcengineering/core' +import { type Builder } from '@hcengineering/model' +import process from './plugin' + +export function defineMethods (builder: Builder): void { + builder.createDoc( + process.class.Method, + core.space.Model, + { + label: process.string.RunProcess, + objectClass: process.class.Process, + editor: process.component.SubProcessEditor, + presenter: process.component.SubProcessPresenter, + createdContext: { _class: process.class.Execution }, + requiredParams: ['_id'] + }, + process.method.RunSubProcess + ) + + builder.createDoc( + process.class.Method, + core.space.Model, + { + label: process.string.CreateToDo, + editor: process.component.ToDoEditor, + objectClass: process.class.ProcessToDo, + presenter: process.component.ToDoPresenter, + createdContext: { _class: process.class.ProcessToDo, nameField: 'title' }, + requiredParams: ['title', 'user'], + defaultParams: { + withRollback: true + } + }, + process.method.CreateToDo + ) + + builder.createDoc( + process.class.Trigger, + core.space.Model, + { + label: process.string.OnExecutionStart, + icon: process.icon.Process, + init: true, + requiredParams: [] + }, + process.trigger.OnExecutionStart + ) + + builder.createDoc( + process.class.Method, + core.space.Model, + { + label: process.string.UpdateCard, + editor: process.component.UpdateCardEditor, + objectClass: card.class.Card, + createdContext: null, + presenter: process.component.UpdateCardPresenter, + requiredParams: [] + }, + process.method.UpdateCard + ) + + builder.createDoc( + process.class.Method, + core.space.Model, + { + label: process.string.CreateCard, + objectClass: card.class.Card, + editor: process.component.CreateCardEditor, + presenter: process.component.CreateCardPresenter, + createdContext: { _class: card.class.Card }, + requiredParams: ['title', '_class'] + }, + process.method.CreateCard + ) + + builder.createDoc( + process.class.Method, + core.space.Model, + { + label: core.string.AddRelation, + objectClass: core.class.Relation, + editor: process.component.AddRelationEditor, + presenter: process.component.AddRelationPresenter, + createdContext: { _class: core.class.Relation }, + requiredParams: ['association', 'direction', '_id'] + }, + process.method.AddRelation + ) + + builder.createDoc( + process.class.Method, + core.space.Model, + { + label: card.string.AddTag, + objectClass: card.class.Tag, + editor: process.component.AddTagEditor, + presenter: process.component.AddTagPresenter, + createdContext: { _class: card.class.Card }, + requiredParams: ['_id'] + }, + process.method.AddTag + ) +} diff --git a/models/process/src/functions.ts b/models/process/src/functions.ts new file mode 100644 index 0000000000..1a6b4c74af --- /dev/null +++ b/models/process/src/functions.ts @@ -0,0 +1,520 @@ +// Copyright © 2025 Hardcore Engineering Inc. +// +// Licensed under the Eclipse Public License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. You may +// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. + +import contact from '@hcengineering/contact' +import core from '@hcengineering/core' +import { type Builder } from '@hcengineering/model' +import process from './plugin' + +export function defineFunctions (builder: Builder): void { + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.TypeString, + category: 'attribute', + label: process.string.UpperCase, + type: 'transform' + }, + process.function.UpperCase + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.TypeString, + category: 'attribute', + label: process.string.LowerCase, + type: 'transform' + }, + process.function.LowerCase + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.TypeString, + category: 'attribute', + label: process.string.Trim, + type: 'transform' + }, + process.function.Trim + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.TypeString, + category: 'attribute', + label: process.string.Prepend, + allowMany: true, + type: 'transform', + editor: process.transformEditor.AppendEditor + }, + process.function.Prepend + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.TypeString, + category: 'attribute', + label: process.string.Append, + allowMany: true, + type: 'transform', + editor: process.transformEditor.AppendEditor + }, + process.function.Append + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.TypeString, + category: 'attribute', + label: process.string.Replace, + allowMany: true, + type: 'transform', + editor: process.transformEditor.ReplaceEditor + }, + process.function.Replace + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.TypeString, + category: 'attribute', + label: process.string.ReplaceAll, + allowMany: true, + type: 'transform', + editor: process.transformEditor.ReplaceEditor + }, + process.function.ReplaceAll + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.TypeString, + category: 'attribute', + label: process.string.Split, + allowMany: true, + type: 'transform', + editor: process.transformEditor.SplitEditor + }, + process.function.Split + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.TypeString, + category: 'attribute', + label: process.string.Cut, + allowMany: true, + editor: process.transformEditor.CutEditor, + type: 'transform' + }, + process.function.Cut + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.ArrOf, + category: undefined, + label: process.string.FirstValue, + type: 'reduce' + }, + process.function.FirstValue + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.ArrOf, + type: 'reduce', + category: undefined, + label: process.string.LastValue + }, + process.function.LastValue + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.ArrOf, + type: 'reduce', + category: undefined, + label: process.string.Random + }, + process.function.Random + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.ArrOf, + category: 'array', + label: process.string.Each, + type: 'reduce' + }, + process.function.All + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.TypeNumber, + type: 'transform', + category: 'attribute', + label: process.string.Add, + presenter: process.transformPresenter.NumberPresenter, + allowMany: true, + editor: process.transformEditor.NumberEditor + }, + process.function.Add + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.TypeNumber, + category: 'attribute', + label: process.string.Subtract, + presenter: process.transformPresenter.NumberPresenter, + allowMany: true, + editor: process.transformEditor.NumberEditor, + type: 'transform' + }, + process.function.Subtract + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.TypeNumber, + category: 'attribute', + label: process.string.Multiply, + presenter: process.transformPresenter.NumberPresenter, + type: 'transform', + allowMany: true, + editor: process.transformEditor.NumberEditor + }, + process.function.Multiply + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.TypeNumber, + category: 'attribute', + label: process.string.Divide, + presenter: process.transformPresenter.NumberPresenter, + type: 'transform', + allowMany: true, + editor: process.transformEditor.NumberEditor + }, + process.function.Divide + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.TypeNumber, + category: 'attribute', + label: process.string.Modulo, + presenter: process.transformPresenter.NumberPresenter, + type: 'transform', + allowMany: true, + editor: process.transformEditor.NumberEditor + }, + process.function.Modulo + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.TypeNumber, + category: 'attribute', + label: process.string.Power, + presenter: process.transformPresenter.NumberPresenter, + type: 'transform', + allowMany: true, + editor: process.transformEditor.NumberEditor + }, + process.function.Power + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.TypeNumber, + category: 'attribute', + label: process.string.Sqrt, + presenter: process.transformPresenter.NumberPresenter, + type: 'transform', + allowMany: true + }, + process.function.Sqrt + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.TypeNumber, + category: 'attribute', + label: process.string.Round, + type: 'transform', + allowMany: true + }, + process.function.Round + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.TypeNumber, + category: 'attribute', + label: process.string.Absolute, + type: 'transform', + allowMany: true + }, + process.function.Absolute + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.TypeNumber, + category: 'attribute', + label: process.string.Ceil, + type: 'transform', + allowMany: true + }, + process.function.Ceil + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.TypeNumber, + category: 'attribute', + label: process.string.Floor, + type: 'transform', + allowMany: true + }, + process.function.Floor + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.TypeDate, + category: 'attribute', + label: process.string.Offset, + editor: process.transformEditor.DateOffsetEditor, + type: 'transform' + }, + process.function.Offset + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.TypeDate, + category: 'attribute', + label: process.string.FirstWorkingDayAfter, + type: 'transform' + }, + process.function.FirstWorkingDayAfter + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.ArrOf, + category: 'array', + label: process.string.Insert, + allowMany: true, + editor: process.transformEditor.MultiArrayElementEditor, + type: 'transform' + }, + process.function.Insert + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.ArrOf, + category: 'array', + label: process.string.Remove, + allowMany: true, + editor: process.transformEditor.ArrayElementEditor, + type: 'transform' + }, + process.function.Remove + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.ArrOf, + category: 'array', + label: process.string.RemoveFirst, + allowMany: true, + type: 'transform' + }, + process.function.RemoveFirst + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.ArrOf, + category: 'array', + label: process.string.RemoveLast, + allowMany: true, + type: 'transform' + }, + process.function.RemoveLast + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: contact.mixin.Employee, + editor: process.component.RoleEditor, + presenter: process.transformPresenter.RolePresenter, + category: 'array', + label: core.string.Role, + type: 'context' + }, + process.function.RoleContext + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.ArrOf, + category: 'array', + label: process.string.EmptyArray, + type: 'context' + }, + process.function.EmptyArray + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: contact.mixin.Employee, + category: 'attribute', + label: process.string.ExecutionInitiator, + type: 'context' + }, + process.function.ExecutionEmployeeInitiator + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: contact.class.Person, + category: 'attribute', + label: process.string.ExecutionInitiator, + type: 'context' + }, + process.function.ExecutionInitiator + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.TypeDate, + category: 'attribute', + label: process.string.ExecutionStarted, + type: 'context' + }, + process.function.ExecutionStarted + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: contact.class.Person, + category: 'attribute', + label: process.string.CurrentUser, + type: 'context' + }, + process.function.CurrentUser + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: contact.mixin.Employee, + category: 'attribute', + label: process.string.CurrentUser, + type: 'context' + }, + process.function.CurrentEmployee + ) + + builder.createDoc( + process.class.ProcessFunction, + core.space.Model, + { + of: core.class.TypeDate, + category: 'attribute', + label: process.string.CurrentDate, + type: 'context' + }, + process.function.CurrentDate + ) +} diff --git a/models/process/src/index.ts b/models/process/src/index.ts index 99f34839eb..88c67600ae 100644 --- a/models/process/src/index.ts +++ b/models/process/src/index.ts @@ -12,7 +12,6 @@ // limitations under the License. import card, { type Card, type MasterTag, type Tag } from '@hcengineering/card' -import contact from '@hcengineering/contact' import core, { AccountRole, type Class, @@ -43,10 +42,12 @@ import presentation from '@hcengineering/model-presentation' import { TToDo } from '@hcengineering/model-time' import view, { createAction } from '@hcengineering/model-view' import workbench from '@hcengineering/model-workbench' +import notification from '@hcengineering/notification' import { type Asset, type IntlString, type Resource } from '@hcengineering/platform' import { type CheckFunc, type ContextId, + type CreatedContext, type Execution, type ExecutionContext, type ExecutionError, @@ -69,6 +70,9 @@ import { import time from '@hcengineering/time' import { type AnyComponent } from '@hcengineering/ui' import { type AttributeCategory } from '@hcengineering/view' +import { defineMethods } from './actions' +import { defineTriggers } from './triggers' +import { defineFunctions } from './functions' import process from './plugin' const DOMAIN_PROCESS = 'process' as Domain @@ -206,7 +210,7 @@ export class TMethod extends TDoc implements Method { editor!: AnyComponent - contextClass!: Ref> | null + createdContext!: CreatedContext presenter?: AnyComponent @@ -247,6 +251,8 @@ export class TUpdateCriteriaComponent extends TDoc implements UpdateCriteriaComp editor!: AnyComponent of!: Ref>> + + props!: Record } export * from './migration' @@ -265,6 +271,28 @@ export function createModel (builder: Builder): void { TUpdateCriteriaComponent ) + builder.createDoc( + notification.class.NotificationType, + core.space.Model, + { + hidden: false, + generated: false, + allowedForAuthor: true, + label: process.string.NewProcessToDo, + group: time.ids.TimeNotificationGroup, + txClasses: [core.class.TxCreateDoc], + objectClass: process.class.ProcessToDo, + onlyOwn: true, + defaultEnabled: true, + templates: { + textTemplate: '{body}', + htmlTemplate: '

{body}

', + subjectTemplate: '{title}' + } + }, + process.ids.ProcessToDoCreated + ) + createAction(builder, { action: view.actionImpl.Delete, label: view.string.Delete, @@ -339,444 +367,9 @@ export function createModel (builder: Builder): void { process.pipeline.ProcessMiddleware ) - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.TypeString, - category: 'attribute', - label: process.string.UpperCase, - type: 'transform' - }, - process.function.UpperCase - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.TypeString, - category: 'attribute', - label: process.string.LowerCase, - type: 'transform' - }, - process.function.LowerCase - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.TypeString, - category: 'attribute', - label: process.string.Trim, - type: 'transform' - }, - process.function.Trim - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.TypeString, - category: 'attribute', - label: process.string.Prepend, - allowMany: true, - type: 'transform', - editor: process.transformEditor.AppendEditor - }, - process.function.Prepend - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.TypeString, - category: 'attribute', - label: process.string.Append, - allowMany: true, - type: 'transform', - editor: process.transformEditor.AppendEditor - }, - process.function.Append - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.TypeString, - category: 'attribute', - label: process.string.Replace, - allowMany: true, - type: 'transform', - editor: process.transformEditor.ReplaceEditor - }, - process.function.Replace - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.TypeString, - category: 'attribute', - label: process.string.ReplaceAll, - allowMany: true, - type: 'transform', - editor: process.transformEditor.ReplaceEditor - }, - process.function.ReplaceAll - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.TypeString, - category: 'attribute', - label: process.string.Split, - allowMany: true, - type: 'transform', - editor: process.transformEditor.SplitEditor - }, - process.function.Split - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.TypeString, - category: 'attribute', - label: process.string.Cut, - allowMany: true, - editor: process.transformEditor.CutEditor, - type: 'transform' - }, - process.function.Cut - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.ArrOf, - category: undefined, - label: process.string.FirstValue, - type: 'reduce' - }, - process.function.FirstValue - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.ArrOf, - type: 'reduce', - category: undefined, - label: process.string.LastValue - }, - process.function.LastValue - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.ArrOf, - type: 'reduce', - category: undefined, - label: process.string.Random - }, - process.function.Random - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.ArrOf, - category: 'array', - label: process.string.Each, - type: 'reduce' - }, - process.function.All - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.TypeNumber, - type: 'transform', - category: 'attribute', - label: process.string.Add, - presenter: process.transformPresenter.NumberPresenter, - allowMany: true, - editor: process.transformEditor.NumberEditor - }, - process.function.Add - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.TypeNumber, - category: 'attribute', - label: process.string.Subtract, - presenter: process.transformPresenter.NumberPresenter, - allowMany: true, - editor: process.transformEditor.NumberEditor, - type: 'transform' - }, - process.function.Subtract - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.TypeNumber, - category: 'attribute', - label: process.string.Multiply, - presenter: process.transformPresenter.NumberPresenter, - type: 'transform', - allowMany: true, - editor: process.transformEditor.NumberEditor - }, - process.function.Multiply - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.TypeNumber, - category: 'attribute', - label: process.string.Divide, - presenter: process.transformPresenter.NumberPresenter, - type: 'transform', - allowMany: true, - editor: process.transformEditor.NumberEditor - }, - process.function.Divide - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.TypeNumber, - category: 'attribute', - label: process.string.Modulo, - presenter: process.transformPresenter.NumberPresenter, - type: 'transform', - allowMany: true, - editor: process.transformEditor.NumberEditor - }, - process.function.Modulo - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.TypeNumber, - category: 'attribute', - label: process.string.Power, - presenter: process.transformPresenter.NumberPresenter, - type: 'transform', - allowMany: true, - editor: process.transformEditor.NumberEditor - }, - process.function.Power - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.TypeNumber, - category: 'attribute', - label: process.string.Round, - type: 'transform', - allowMany: true - }, - process.function.Round - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.TypeNumber, - category: 'attribute', - label: process.string.Absolute, - type: 'transform', - allowMany: true - }, - process.function.Absolute - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.TypeNumber, - category: 'attribute', - label: process.string.Ceil, - type: 'transform', - allowMany: true - }, - process.function.Ceil - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.TypeNumber, - category: 'attribute', - label: process.string.Floor, - type: 'transform', - allowMany: true - }, - process.function.Floor - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.TypeDate, - category: 'attribute', - label: process.string.Offset, - editor: process.transformEditor.DateOffsetEditor, - type: 'transform' - }, - process.function.Offset - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.TypeDate, - category: 'attribute', - label: process.string.FirstWorkingDayAfter, - type: 'transform' - }, - process.function.FirstWorkingDayAfter - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.ArrOf, - category: 'array', - label: process.string.Insert, - allowMany: true, - editor: process.transformEditor.MultiArrayElementEditor, - type: 'transform' - }, - process.function.Insert - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.ArrOf, - category: 'array', - label: process.string.Remove, - allowMany: true, - editor: process.transformEditor.ArrayElementEditor, - type: 'transform' - }, - process.function.Remove - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.ArrOf, - category: 'array', - label: process.string.RemoveFirst, - allowMany: true, - type: 'transform' - }, - process.function.RemoveFirst - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.ArrOf, - category: 'array', - label: process.string.RemoveLast, - allowMany: true, - type: 'transform' - }, - process.function.RemoveLast - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: contact.mixin.Employee, - editor: process.component.RoleEditor, - presenter: process.transformPresenter.RolePresenter, - category: 'array', - label: core.string.Role, - type: 'context' - }, - process.function.RoleContext - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: contact.class.Person, - category: 'attribute', - label: process.string.CurrentUser, - type: 'context' - }, - process.function.CurrentUser - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: contact.mixin.Employee, - category: 'attribute', - label: process.string.CurrentUser, - type: 'context' - }, - process.function.CurrentEmployee - ) - - builder.createDoc( - process.class.ProcessFunction, - core.space.Model, - { - of: core.class.TypeDate, - category: 'attribute', - label: process.string.CurrentDate, - type: 'context' - }, - process.function.CurrentDate - ) + defineFunctions(builder) + defineMethods(builder) + defineTriggers(builder) builder.mixin(process.class.Process, core.class.Class, view.mixin.AttributePresenter, { presenter: process.component.ProcessPresenter @@ -989,183 +582,6 @@ export function createModel (builder: Builder): void { process.section.CardProcesses ) - builder.createDoc( - process.class.Method, - core.space.Model, - { - label: process.string.RunProcess, - objectClass: process.class.Process, - editor: process.component.SubProcessEditor, - presenter: process.component.SubProcessPresenter, - contextClass: process.class.Execution, - requiredParams: ['_id'] - }, - process.method.RunSubProcess - ) - - builder.createDoc( - process.class.Method, - core.space.Model, - { - label: process.string.CreateToDo, - editor: process.component.ToDoEditor, - objectClass: process.class.ProcessToDo, - presenter: process.component.ToDoPresenter, - contextClass: process.class.ProcessToDo, - requiredParams: ['state', 'title', 'user'], - defaultParams: { - withRollback: true - } - }, - process.method.CreateToDo - ) - - builder.createDoc( - process.class.Trigger, - core.space.Model, - { - label: process.string.OnExecutionStart, - icon: process.icon.Process, - init: true, - requiredParams: [] - }, - process.trigger.OnExecutionStart - ) - - builder.createDoc( - process.class.Method, - core.space.Model, - { - label: process.string.UpdateCard, - editor: process.component.UpdateCardEditor, - objectClass: card.class.Card, - contextClass: null, - presenter: process.component.UpdateCardPresenter, - requiredParams: [] - }, - process.method.UpdateCard - ) - - builder.createDoc( - process.class.Method, - core.space.Model, - { - label: process.string.CreateCard, - objectClass: card.class.Card, - editor: process.component.CreateCardEditor, - presenter: process.component.CreateCardPresenter, - contextClass: card.class.Card, - requiredParams: ['title', '_class'] - }, - process.method.CreateCard - ) - - builder.createDoc( - process.class.Method, - core.space.Model, - { - label: core.string.AddRelation, - objectClass: core.class.Relation, - editor: process.component.AddRelationEditor, - presenter: process.component.AddRelationPresenter, - contextClass: core.class.Relation, - requiredParams: ['association', 'direction', '_id'] - }, - process.method.AddRelation - ) - - builder.createDoc( - process.class.Method, - core.space.Model, - { - label: card.string.AddTag, - objectClass: card.class.Tag, - editor: process.component.AddTagEditor, - presenter: process.component.AddTagPresenter, - contextClass: card.class.Card, - requiredParams: ['_id'] - }, - process.method.AddTag - ) - - builder.createDoc( - process.class.Trigger, - core.space.Model, - { - label: process.string.OnToDoDone, - icon: process.icon.ToDo, - editor: process.component.ToDoCloseEditor, - presenter: process.component.ToDoSettingPresenter, - requiredParams: ['_id'], - checkFunction: process.triggerCheck.ToDo, - init: false, - auto: true - }, - process.trigger.OnToDoClose - ) - - builder.createDoc( - process.class.Trigger, - core.space.Model, - { - label: process.string.OnToDoCancelled, - icon: process.icon.ToDoRemove, - editor: process.component.ToDoRemoveEditor, - presenter: process.component.ToDoSettingPresenter, - requiredParams: ['_id'], - checkFunction: process.triggerCheck.ToDo, - init: false, - auto: true - }, - process.trigger.OnToDoRemove - ) - - builder.createDoc( - process.class.Trigger, - core.space.Model, - { - label: process.string.OnCardUpdate, - icon: process.icon.OnCardUpdate, - editor: process.component.CardUpdateEditor, - presenter: process.component.CardUpdatePresenter, - requiredParams: [], - checkFunction: process.triggerCheck.UpdateCheck, - init: false, - auto: true - }, - process.trigger.OnCardUpdate - ) - - builder.createDoc( - process.class.Trigger, - core.space.Model, - { - label: process.string.OnSubProcessesDone, - icon: process.icon.WaitSubprocesses, - checkFunction: process.triggerCheck.SubProcessesDoneCheck, - requiredParams: [], - init: false, - auto: true - }, - process.trigger.OnSubProcessesDone - ) - - builder.createDoc( - process.class.Trigger, - core.space.Model, - { - label: process.string.WaitUntil, - icon: process.icon.Time, - requiredParams: [], - init: false, - auto: true, - editor: process.component.TimeEditor, - presenter: process.component.TimePresenter, - checkFunction: process.triggerCheck.Time - }, - process.trigger.OnTime - ) - builder.createDoc(card.class.MasterTagEditorSection, core.space.Model, { id: 'processes', label: process.string.Processes, @@ -1179,50 +595,83 @@ export function createModel (builder: Builder): void { builder.createDoc(process.class.UpdateCriteriaComponent, core.space.Model, { category: 'attribute', - editor: process.criteriaEditor.StringCriteria, - of: core.class.TypeString + editor: process.criteriaEditor.BaseCriteria, + of: core.class.TypeString, + props: { + modes: ['Equal', 'StringContains', 'Exists'] + } }) builder.createDoc(process.class.UpdateCriteriaComponent, core.space.Model, { category: 'attribute', - editor: process.criteriaEditor.StringCriteria, - of: core.class.TypeHyperlink + editor: process.criteriaEditor.BaseCriteria, + of: core.class.TypeHyperlink, + props: { + modes: ['Equal', 'StringContains', 'Exists'] + } }) builder.createDoc(process.class.UpdateCriteriaComponent, core.space.Model, { category: 'attribute', - editor: process.criteriaEditor.NumberCriteria, - of: core.class.TypeNumber + editor: process.criteriaEditor.BaseCriteria, + of: core.class.TypeNumber, + props: { + modes: ['Equal', 'GT', 'LT', 'Between', 'Exists'] + } }) builder.createDoc(process.class.UpdateCriteriaComponent, core.space.Model, { category: 'attribute', - editor: process.criteriaEditor.DateCriteria, - of: core.class.TypeDate + editor: process.criteriaEditor.BaseCriteria, + of: core.class.TypeDate, + props: { + modes: ['Equal', 'GT', 'LT', 'Between', 'Exists'] + } }) builder.createDoc(process.class.UpdateCriteriaComponent, core.space.Model, { category: 'attribute', - editor: process.criteriaEditor.BooleanCriteria, - of: core.class.TypeBoolean + editor: process.criteriaEditor.BaseCriteria, + of: core.class.TypeBoolean, + props: { + modes: ['Equal', 'NotEqual', 'Exists'] + } }) builder.createDoc(process.class.UpdateCriteriaComponent, core.space.Model, { category: 'array', - editor: process.criteriaEditor.ArrayCriteria, - of: core.class.ArrOf + editor: process.criteriaEditor.BaseCriteria, + of: core.class.ArrOf, + props: { + modes: [ + 'ArrayAll', + 'ArrayAny', + 'ArrayNotIncludes', + 'ArraySizeEquals', + 'ArraySizeGt', + 'ArraySizeGte', + 'ArraySizeLt', + 'ArraySizeLte' + ] + } }) builder.createDoc(process.class.UpdateCriteriaComponent, core.space.Model, { category: 'attribute', - editor: process.criteriaEditor.EnumCriteria, - of: core.class.EnumOf + editor: process.criteriaEditor.BaseCriteria, + of: core.class.EnumOf, + props: { + modes: ['Equal', 'NotEqual', 'Exists'] + } }) builder.createDoc(process.class.UpdateCriteriaComponent, core.space.Model, { category: 'object', - editor: process.criteriaEditor.RefCriteria, - of: core.class.RefTo + editor: process.criteriaEditor.BaseCriteria, + of: core.class.RefTo, + props: { + modes: ['Equal', 'NotEqual', 'Exists'] + } }) } diff --git a/models/process/src/plugin.ts b/models/process/src/plugin.ts index 7dec168837..7188dc8da6 100644 --- a/models/process/src/plugin.ts +++ b/models/process/src/plugin.ts @@ -30,7 +30,8 @@ export default mergeIds(processId, process, { ProcessMiddleware: '' as Ref }, ids: { - ProcessSettings: '' as Ref + ProcessSettings: '' as Ref, + ProcessToDoCreated: '' as Ref }, actionImpl: { ContinueExecution: '' as ViewAction @@ -40,6 +41,7 @@ export default mergeIds(processId, process, { ContinueExecution: '' as Ref> }, string: { + NewProcessToDo: '' as IntlString, ConfigLabel: '' as IntlString, ConfigDescription: '' as IntlString, LogAction: '' as IntlString diff --git a/models/process/src/triggers.ts b/models/process/src/triggers.ts new file mode 100644 index 0000000000..c454858bd6 --- /dev/null +++ b/models/process/src/triggers.ts @@ -0,0 +1,112 @@ +// Copyright © 2025 Hardcore Engineering Inc. +// +// Licensed under the Eclipse Public License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. You may +// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. + +import core from '@hcengineering/core' +import { type Builder } from '@hcengineering/model' +import process from './plugin' + +export function defineTriggers (builder: Builder): void { + builder.createDoc( + process.class.Trigger, + core.space.Model, + { + label: process.string.OnToDoDone, + icon: process.icon.ToDo, + editor: process.component.ToDoCloseEditor, + presenter: process.component.ToDoSettingPresenter, + requiredParams: ['_id'], + checkFunction: process.triggerCheck.ToDo, + init: false, + auto: true + }, + process.trigger.OnToDoClose + ) + + builder.createDoc( + process.class.Trigger, + core.space.Model, + { + label: process.string.OnToDoCancelled, + icon: process.icon.ToDoRemove, + editor: process.component.ToDoRemoveEditor, + presenter: process.component.ToDoSettingPresenter, + requiredParams: ['_id'], + checkFunction: process.triggerCheck.ToDo, + init: false, + auto: true + }, + process.trigger.OnToDoRemove + ) + + builder.createDoc( + process.class.Trigger, + core.space.Model, + { + label: process.string.WhenCardMatches, + icon: process.icon.WhenCardMatches, + editor: process.component.CardUpdateEditor, + presenter: process.component.CardUpdatePresenter, + requiredParams: [], + checkFunction: process.triggerCheck.MatchCheck, + init: false, + auto: true + }, + process.trigger.OnCardUpdate + ) + + builder.createDoc( + process.class.Trigger, + core.space.Model, + { + label: process.string.WhenFieldChanges, + icon: process.icon.WhenFieldChanges, + editor: process.component.FieldChangesEditor, + presenter: process.component.CardUpdatePresenter, + requiredParams: [], + checkFunction: process.triggerCheck.FieldChangedCheck, + init: false, + auto: true + }, + process.trigger.WhenFieldChanges + ) + + builder.createDoc( + process.class.Trigger, + core.space.Model, + { + label: process.string.OnSubProcessesDone, + icon: process.icon.WaitSubprocesses, + checkFunction: process.triggerCheck.SubProcessesDoneCheck, + requiredParams: [], + init: false, + auto: true + }, + process.trigger.OnSubProcessesDone + ) + + builder.createDoc( + process.class.Trigger, + core.space.Model, + { + label: process.string.WaitUntil, + icon: process.icon.Time, + requiredParams: [], + init: false, + auto: true, + editor: process.component.TimeEditor, + presenter: process.component.TimePresenter, + checkFunction: process.triggerCheck.Time + }, + process.trigger.OnTime + ) +} diff --git a/models/recruit/src/index.ts b/models/recruit/src/index.ts index 1db7678b7c..9da4ca3b8e 100644 --- a/models/recruit/src/index.ts +++ b/models/recruit/src/index.ts @@ -37,6 +37,7 @@ import { type KeyBinding, type ViewOptionModel, type ViewOptionsModel } from '@h import recruit from './plugin' import { createReviewModel, reviewTableConfig, reviewTableOptions } from './review' import { defineSpaceType } from './spaceType' +import { definePermissions } from './permissions' import { TApplicant, TApplicantMatch, TCandidate, TOpinion, TReview, TVacancy, TVacancyList } from './types' export { recruitId } from '@hcengineering/recruit' @@ -1019,24 +1020,28 @@ export function createModel (builder: Builder): void { }, override: [recruit.action.CreateGlobalApplication] }) - createAction(builder, { - action: view.actionImpl.ShowPopup, - actionProps: { - component: recruit.component.CreateCandidate, - element: 'top' + createAction( + builder, + { + action: view.actionImpl.ShowPopup, + actionProps: { + component: recruit.component.CreateCandidate, + element: 'top' + }, + label: recruit.string.CreateTalent, + icon: recruit.icon.Create, + keyBinding: ['keyC'], + input: 'none', + category: recruit.category.Recruit, + target: core.class.Doc, + context: { + mode: ['workbench', 'browser'], + application: recruit.app.Recruit, + group: 'create' + } }, - label: recruit.string.CreateTalent, - icon: recruit.icon.Create, - keyBinding: ['keyC'], - input: 'none', - category: recruit.category.Recruit, - target: core.class.Doc, - context: { - mode: ['workbench', 'browser'], - application: recruit.app.Recruit, - group: 'create' - } - }) + recruit.action.CreateTalent + ) createAction(builder, { action: view.actionImpl.ShowPopup, @@ -1596,4 +1601,5 @@ export function createModel (builder: Builder): void { ) defineSpaceType(builder) + definePermissions(builder) } diff --git a/models/recruit/src/permissions.ts b/models/recruit/src/permissions.ts new file mode 100644 index 0000000000..beeb9b11cb --- /dev/null +++ b/models/recruit/src/permissions.ts @@ -0,0 +1,19 @@ +import type { Builder } from '@hcengineering/model' +import core from '@hcengineering/core' +import recruit from '@hcengineering/recruit' + +export function definePermissions (builder: Builder): void { + builder.createDoc( + core.class.Permission, + core.space.Model, + { + label: recruit.string.ForbidCreateVacancyPermission, + scope: 'workspace', + txClass: core.class.TxCreateDoc, + objectClass: recruit.class.Vacancy, + forbid: true, + description: recruit.string.ForbidCreateVacancyPermissionDescription + }, + recruit.permission.ForbidCreateVacancy + ) +} diff --git a/models/server-process/src/index.ts b/models/server-process/src/index.ts index 9cc3d90c7b..0d9c6310fb 100644 --- a/models/server-process/src/index.ts +++ b/models/server-process/src/index.ts @@ -61,7 +61,11 @@ export function createModel (builder: Builder): void { }) builder.mixin(process.trigger.OnCardUpdate, process.class.Trigger, serverProcess.mixin.TriggerImpl, { - serverCheckFunc: serverProcess.func.OnCardUpdateCheck + serverCheckFunc: serverProcess.func.MatchCardCheck + }) + + builder.mixin(process.trigger.WhenFieldChanges, process.class.Trigger, serverProcess.mixin.TriggerImpl, { + serverCheckFunc: serverProcess.func.FieldChangedCheck }) builder.mixin(process.trigger.OnTime, process.class.Trigger, serverProcess.mixin.TriggerImpl, { @@ -173,6 +177,10 @@ export function createModel (builder: Builder): void { func: serverProcess.transform.Power }) + builder.mixin(process.function.Sqrt, process.class.ProcessFunction, serverProcess.mixin.FuncImpl, { + func: serverProcess.transform.Sqrt + }) + builder.mixin(process.function.Round, process.class.ProcessFunction, serverProcess.mixin.FuncImpl, { func: serverProcess.transform.Round }) @@ -229,6 +237,27 @@ export function createModel (builder: Builder): void { func: serverProcess.transform.RemoveLast }) + builder.mixin(process.function.EmptyArray, process.class.ProcessFunction, serverProcess.mixin.FuncImpl, { + func: serverProcess.transform.EmptyArray + }) + + builder.mixin( + process.function.ExecutionEmployeeInitiator, + process.class.ProcessFunction, + serverProcess.mixin.FuncImpl, + { + func: serverProcess.transform.ExecutionInitiator + } + ) + + builder.mixin(process.function.ExecutionInitiator, process.class.ProcessFunction, serverProcess.mixin.FuncImpl, { + func: serverProcess.transform.ExecutionInitiator + }) + + builder.mixin(process.function.ExecutionStarted, process.class.ProcessFunction, serverProcess.mixin.FuncImpl, { + func: serverProcess.transform.ExecutionStarted + }) + builder.createDoc(serverCore.class.Trigger, core.space.Model, { trigger: serverProcess.trigger.OnExecutionContinue, txMatch: { diff --git a/models/time/src/index.ts b/models/time/src/index.ts index bf5717c712..d9e5f60c49 100644 --- a/models/time/src/index.ts +++ b/models/time/src/index.ts @@ -52,7 +52,7 @@ import document from '@hcengineering/model-document' import tracker from '@hcengineering/model-tracker' import view, { createAction } from '@hcengineering/model-view' import workbench from '@hcengineering/model-workbench' -import notification from '@hcengineering/notification' +import notification, { type NotificationGroup } from '@hcengineering/notification' import recruit from '@hcengineering/recruit' import tags from '@hcengineering/tags' import { @@ -372,7 +372,7 @@ export function createModel (builder: Builder): void { generated: false, allowedForAuthor: true, label: time.string.NewToDo, - group: time.ids.TimeNotificationGroup, + group: time.ids.TimeNotificationGroup as Ref, txClasses: [core.class.TxCreateDoc], objectClass: time.class.ProjectToDo, onlyOwn: true, diff --git a/models/time/src/plugin.ts b/models/time/src/plugin.ts index 5ef69c4a54..8c2d0db0ab 100644 --- a/models/time/src/plugin.ts +++ b/models/time/src/plugin.ts @@ -15,7 +15,7 @@ import { type Client, type Doc, type Ref } from '@hcengineering/core' import { type Application } from '@hcengineering/model-workbench' -import { type NotificationGroup, type NotificationType } from '@hcengineering/notification' +import { type NotificationType } from '@hcengineering/notification' import { type IntlString, mergeIds, type Resource } from '@hcengineering/platform' import { timeId } from '@hcengineering/time' import time from '@hcengineering/time-resources/src/plugin' @@ -56,7 +56,6 @@ export default mergeIds(timeId, time, { Team: '' as Ref }, ids: { - TimeNotificationGroup: '' as Ref, ToDoCreated: '' as Ref }, function: { diff --git a/models/tracker/src/index.ts b/models/tracker/src/index.ts index 0563ea0a1f..04395afc0e 100644 --- a/models/tracker/src/index.ts +++ b/models/tracker/src/index.ts @@ -32,6 +32,7 @@ import { PaletteColorIndexes } from '@hcengineering/ui/src/colors' import { createActions as defineActions } from './actions' import tracker from './plugin' import { definePresenters } from './presenters' +import { definePermissions } from './permissions' import { DOMAIN_TRACKER, TClassicProjectTypeData, @@ -709,6 +710,7 @@ export function createModel (builder: Builder): void { ] }) + definePermissions(builder) defineSpaceType(builder) } diff --git a/models/tracker/src/permissions.ts b/models/tracker/src/permissions.ts new file mode 100644 index 0000000000..6ebddfedeb --- /dev/null +++ b/models/tracker/src/permissions.ts @@ -0,0 +1,19 @@ +import type { Builder } from '@hcengineering/model' +import core from '@hcengineering/core' +import tracker from '@hcengineering/tracker' + +export function definePermissions (builder: Builder): void { + builder.createDoc( + core.class.Permission, + core.space.Model, + { + label: tracker.string.ForbidCreateProjectPermission, + txClass: core.class.TxCreateDoc, + objectClass: tracker.class.Project, + forbid: true, + scope: 'workspace', + description: tracker.string.ForbidCreateProjectPermissionDescription + }, + tracker.permission.ForbidCreateProject + ) +} diff --git a/models/training/src/index.ts b/models/training/src/index.ts index 82980172d8..edaf0c0cbd 100644 --- a/models/training/src/index.ts +++ b/models/training/src/index.ts @@ -354,18 +354,22 @@ function defineTraining (builder: Builder): void { definePermission(builder, training.permission.ChangeSomeoneElsesTrainingOwner, { label: training.string.Permission_ChangeSomeoneElsesTrainingOwner, + scope: 'space', description: training.string.Permission_ChangeSomeoneElsesTrainingOwner_Description }) definePermission(builder, training.permission.CreateTraining, { label: training.string.Permission_CreateTraining, + scope: 'space', description: training.string.Permission_CreateTraining_Description }) definePermission(builder, training.permission.ViewSomeoneElsesTrainingOverview, { label: training.string.Permission_ViewSomeoneElsesTrainingOverview, + scope: 'space', description: training.string.Permission_ViewSomeoneElsesTrainingOverview_Description }) definePermission(builder, training.permission.ViewSomeoneElsesTrainingQuestions, { label: training.string.Permission_ViewSomeoneElsesTrainingQuestions, + scope: 'space', description: training.string.Permission_ViewSomeoneElsesTrainingQuestions_Description }) } @@ -491,14 +495,17 @@ function defineTrainingRequest (builder: Builder): void { definePermission(builder, training.permission.ChangeSomeoneElsesSentRequestOwner, { label: training.string.Permission_ChangeSomeoneElsesSentRequestOwner, + scope: 'space', description: training.string.Permission_ChangeSomeoneElsesSentRequestOwner_Description }) definePermission(builder, training.permission.CreateRequestOnSomeoneElsesTraining, { label: training.string.Permission_CreateRequestOnSomeoneElsesTraining, + scope: 'space', description: training.string.Permission_CreateRequestOnSomeoneElsesTraining_Description }) definePermission(builder, training.permission.ViewSomeoneElsesSentRequest, { label: training.string.Permission_ViewSomeoneElsesSentRequest, + scope: 'space', description: training.string.Permission_ViewSomeoneElsesSentRequest_Description }) })() @@ -753,6 +760,7 @@ function defineTrainingAttempt (builder: Builder): void { definePermission(builder, training.permission.ViewSomeoneElsesTraineesResults, { label: training.string.Permission_ViewSomeoneElsesTraineesResults, + scope: 'space', description: training.string.Permission_ViewSomeoneElsesTraineesResults_Description }) } diff --git a/models/view/src/index.ts b/models/view/src/index.ts index f9e012dd24..5ca2d0d41f 100644 --- a/models/view/src/index.ts +++ b/models/view/src/index.ts @@ -244,7 +244,7 @@ export class TObjectValidator extends TClass implements ObjectValidator { @Mixin(view.mixin.ObjectFactory, core.class.Class) export class TObjectFactory extends TClass implements ObjectFactory { component?: AnyComponent - create?: Resource<() => Promise> + create?: Resource<(props?: Record) => Promise | undefined>> } @Mixin(view.mixin.ObjectTitle, core.class.Class) @@ -835,6 +835,25 @@ export function createModel (builder: Builder): void { view.action.Join ) + createAction(builder, { + action: view.actionImpl.ShowPopup, + actionProps: { + component: view.component.AddRelationPopup, + fillProps: { + _objects: 'value' + } + }, + label: core.string.AddRelation, + input: 'any', + icon: view.icon.CopyLink, + category: view.category.Editor, + target: core.class.Doc, + context: { + mode: ['context', 'browser'], + group: 'associate' + } + }) + createAction( builder, { diff --git a/models/view/src/plugin.ts b/models/view/src/plugin.ts index d756b561fa..448c0c4bbe 100644 --- a/models/view/src/plugin.ts +++ b/models/view/src/plugin.ts @@ -96,7 +96,8 @@ export default mergeIds(viewId, view, { BaseDocPresenter: '' as AnyComponent, MasterDetailView: '' as AnyComponent, AssociationPresenter: '' as AnyComponent, - TreeView: '' as AnyComponent + TreeView: '' as AnyComponent, + AddRelationPopup: '' as AnyComponent }, string: { Table: '' as IntlString, diff --git a/models/workbench/src/index.ts b/models/workbench/src/index.ts index 60b57853aa..ec6061eab9 100644 --- a/models/workbench/src/index.ts +++ b/models/workbench/src/index.ts @@ -192,6 +192,22 @@ export function createModel (builder: Builder): void { group: 'edit' } }) + + createAction( + builder, + { + action: workbench.actionImpl.CloseCurrentTab, + label: presentation.string.Close, + icon: view.icon.Delete, + keyBinding: ['Meta + keyW', 'Ctrl + keyW'], + input: 'none', + category: workbench.category.Workbench, + allowedForEditableContent: 'always', + target: core.class.Doc, + context: { mode: ['workbench', 'browser', 'panel', 'editor', 'input'] } + }, + workbench.action.CloseCurrentTab + ) } export default workbench diff --git a/models/workbench/src/plugin.ts b/models/workbench/src/plugin.ts index 35a63ec27e..4eb7bc7c1b 100644 --- a/models/workbench/src/plugin.ts +++ b/models/workbench/src/plugin.ts @@ -40,6 +40,7 @@ export default mergeIds(workbenchId, workbench, { actionImpl: { PinTab: '' as Resource<(doc?: Doc | Doc[]) => Promise>, UnpinTab: '' as Resource<(doc?: Doc | Doc[]) => Promise>, - CloseTab: '' as Resource<(doc?: Doc | Doc[]) => Promise> + CloseTab: '' as Resource<(doc?: Doc | Doc[]) => Promise>, + CloseCurrentTab: '' as Resource<(doc?: Doc | Doc[]) => Promise> } }) diff --git a/packages/account-client/src/client.ts b/packages/account-client/src/client.ts index b6f8de7c7c..96baa83b22 100644 --- a/packages/account-client/src/client.ts +++ b/packages/account-client/src/client.ts @@ -220,6 +220,7 @@ export interface AccountClient { getIntegrationSecret: (integrationSecretKey: IntegrationSecretKey) => Promise listIntegrationsSecrets: (filter: Partial) => Promise getAccountInfo: (uuid: AccountUuid) => Promise + canMergeSpecifiedPersons: (primaryPerson: PersonUuid, secondaryPerson: PersonUuid) => Promise mergeSpecifiedPersons: (primaryPerson: PersonUuid, secondaryPerson: PersonUuid) => Promise mergeSpecifiedAccounts: (primaryAccount: AccountUuid, secondaryAccount: AccountUuid) => Promise addEmailSocialId: (email: string) => Promise @@ -1072,6 +1073,15 @@ class AccountClientImpl implements AccountClient { return await this.rpc(request) } + async canMergeSpecifiedPersons (primaryPerson: PersonUuid, secondaryPerson: PersonUuid): Promise { + const request = { + method: 'canMergeSpecifiedPersons' as const, + params: { primaryPerson, secondaryPerson } + } + + return await this.rpc(request) + } + async mergeSpecifiedPersons (primaryPerson: PersonUuid, secondaryPerson: PersonUuid): Promise { const request = { method: 'mergeSpecifiedPersons' as const, diff --git a/packages/account-client/src/types.ts b/packages/account-client/src/types.ts index 41ef820273..73a1584e45 100644 --- a/packages/account-client/src/types.ts +++ b/packages/account-client/src/types.ts @@ -40,6 +40,7 @@ export interface LoginInfoWorkspace { endpoint: EndpointInfo role: AccountRole | null progress?: number + branding?: string } export interface LoginInfoWithWorkspaces extends LoginInfo { diff --git a/packages/api-client/src/rest/tx.ts b/packages/api-client/src/rest/tx.ts index b090c50f2d..d13a68ecea 100644 --- a/packages/api-client/src/rest/tx.ts +++ b/packages/api-client/src/rest/tx.ts @@ -82,7 +82,7 @@ class RestTxClient implements Client { params: DomainParams, options?: DomainRequestOptions ): Promise> { - throw new Error('Domain request operation not supported') + return await this.client.domainRequest(domain, params, options) } async findOne( diff --git a/packages/core/lang/cs.json b/packages/core/lang/cs.json index 878cc9109d..8a312b656e 100644 --- a/packages/core/lang/cs.json +++ b/packages/core/lang/cs.json @@ -69,4 +69,4 @@ "PersonId": "Osoba", "AccountId": "Účet" } -} \ No newline at end of file +} diff --git a/packages/core/lang/fr.json b/packages/core/lang/fr.json index 7b248d769b..bb4b311b71 100644 --- a/packages/core/lang/fr.json +++ b/packages/core/lang/fr.json @@ -69,4 +69,4 @@ "PersonId": "Id de personne", "AccountId": "Compte" } -} \ No newline at end of file +} diff --git a/packages/core/lang/tr.json b/packages/core/lang/tr.json new file mode 100644 index 0000000000..1f862d2e08 --- /dev/null +++ b/packages/core/lang/tr.json @@ -0,0 +1,72 @@ +{ + "string": { + "Id": "Id", + "Space": "Alan", + "Spaces": "Alanlar", + "SpacesDescription": "Tüm alanların alan tipini yönet", + "TypedSpace": "Tipli alan", + "SpaceType": "Alan tipi", + "Modified": "Değiştirildi", + "ModifiedDate": "Değiştirilme tarihi", + "ModifiedBy": "Değiştiren", + "Class": "Sınıf", + "AttachedTo": "Eklenen", + "AttachedToClass": "Eklenen sınıf", + "Name": "İsim", + "Description": "Açıklama", + "ShortDescription": "Kısa açıklama", + "Descriptor": "Tanımlayıcı", + "TargetClass": "Hedef sınıf", + "Role": "Rol", + "Roles": "Roller", + "Private": "Özel", + "Archived": "Arşivlendi", + "ClassLabel": "Tip", + "ClassPropertyLabel": "Etiket", + "String": "Metin", + "Markup": "İşaretleme", + "Number": "Sayı", + "Boolean": "Onay kutusu", + "Timestamp": "Zaman damgası", + "Date": "Tarih", + "IntlString": "IntlString", + "Ref": "Referans", + "Collection": "Koleksiyon", + "Array": "Çoklu Seçim", + "Enum": "Seçim", + "Members": "Üyeler", + "Hyperlink": "URL", + "MarkupBlobRef": "İşbirlikçi", + "Object": "Nesne", + "System": "Sistem", + "CreatedBy": "Oluşturan", + "CreatedDate": "Oluşturulma tarihi", + "Status": "Durum", + "StatusCategory": "Durum kategorisi", + "Account": "Hesap", + "Rank": "Sıra", + "Owners": "Sahipler", + "Permission": "İzin", + "CreateObject": "Nesne oluştur", + "UpdateObject": "Nesneyi güncelle", + "DeleteObject": "Nesneyi sil", + "ForbidDeleteObject": "Nesne silmeyi yasakla", + "UpdateSpace": "Alanı güncelle", + "ArchiveSpace": "Alanı arşivle", + "CreateObjectDescription": "Kullanıcılara alanda nesne oluşturma yetkisi verir", + "UpdateObjectDescription": "Kullanıcılara alandaki nesneleri güncelleme yetkisi verir", + "DeleteObjectDescription": "Kullanıcılara alandaki nesneleri silme yetkisi verir", + "ForbidDeleteObjectDescription": "Kullanıcıların alandaki nesneleri silmesini yasaklar", + "UpdateSpaceDescription": "Kullanıcılara alanı güncelleme yetkisi verir", + "ArchiveSpaceDescription": "Kullanıcılara alanı arşivleme yetkisi verir", + "AutoJoin": "Otomatik katıl", + "AutoJoinDescr": "Yeni çalışanları bu alana otomatik olarak ekle", + "BlobSize": "Boyut", + "BlobContentType": "İçerik türü", + "Relation": "İlişki", + "Relations": "İlişkiler", + "AddRelation": "İlişki ekle", + "PersonId": "Kişi", + "AccountId": "Hesap" + } +} diff --git a/packages/core/src/classes.ts b/packages/core/src/classes.ts index 17673915a0..12aa10bacf 100644 --- a/packages/core/src/classes.ts +++ b/packages/core/src/classes.ts @@ -17,6 +17,7 @@ import type { Asset, IntlString, Plugin } from '@hcengineering/platform' import type { DocumentQuery } from './storage' import { type WorkspaceDataId, type WorkspaceUuid } from './utils' +import { Tx } from '.' /** * @public @@ -333,6 +334,15 @@ export interface TypeDate extends Type { withShift: boolean } +/** + * @public + */ +export interface TypeNumber extends Type { + min?: number + max?: number + digits?: number // Number of digits after comma +} + /** * @public */ @@ -520,6 +530,10 @@ export type RolesAssignment = Record, AccountUuid[] | undefined> */ export interface Permission extends Doc { label: IntlString + txClass?: Ref> + forbid?: boolean + objectClass?: Ref> + scope?: 'space' | 'workspace' description?: IntlString icon?: Asset } diff --git a/packages/hulylake-client/src/client.ts b/packages/hulylake-client/src/client.ts index aba1bf55ba..956a8f6d23 100644 --- a/packages/hulylake-client/src/client.ts +++ b/packages/hulylake-client/src/client.ts @@ -33,7 +33,7 @@ class Client implements HulylakeClient { } private objectUrl (key: string): string { - return `${this.baseUrl}/api/${this.workspace}/${key}` + return `${this.baseUrl}/api/${this.workspace}/${encodeURIComponent(key)}` } private authHeaders (init?: HeadersInit): Headers { diff --git a/packages/hulylake-client/src/error.ts b/packages/hulylake-client/src/error.ts index a5f9281201..a26cbd711a 100644 --- a/packages/hulylake-client/src/error.ts +++ b/packages/hulylake-client/src/error.ts @@ -26,10 +26,3 @@ export class HulylakeError extends Error { this.name = 'HulylakeError' } } - -export class NotFoundError extends Error { - constructor (message: string) { - super(message) - this.name = 'NotFoundError' - } -} diff --git a/packages/hulylake-client/src/types.ts b/packages/hulylake-client/src/types.ts index bc7c4a7443..bce6daf6f0 100644 --- a/packages/hulylake-client/src/types.ts +++ b/packages/hulylake-client/src/types.ts @@ -69,6 +69,7 @@ export type JsonPatch = | { op: 'test', path: string, value: any } | { hop: 'add', path: string, value: any, safe?: boolean } | { hop: 'inc', path: string, value: number, safe?: boolean } + | { hop: 'remove', path: string, safe?: boolean } export interface HulyResponse { ok: boolean diff --git a/packages/hulylake-client/src/utils.ts b/packages/hulylake-client/src/utils.ts index fadc0a6f1b..5202756d51 100644 --- a/packages/hulylake-client/src/utils.ts +++ b/packages/hulylake-client/src/utils.ts @@ -14,7 +14,7 @@ // import { RetryOptions, withRetry } from '@hcengineering/retry' -import { HulylakeError, NetworkError, NotFoundError } from './error' +import { HulylakeError, NetworkError } from './error' async function innerFetchSafe (url: string | URL, init?: RequestInit): Promise { let response @@ -31,7 +31,7 @@ async function innerFetchSafe (url: string | URL, init?: RequestInit): Promise { /** * @public */ -export function TypeNumber (): Type { - return { _class: core.class.TypeNumber, label: core.string.Number, icon: core.icon.TypeNumber } +export function TypeNumber (min?: number, max?: number, digits?: number): TypeNumberType { + return { _class: core.class.TypeNumber, label: core.string.Number, icon: core.icon.TypeNumber, min, max, digits } } /** diff --git a/packages/platform/lang/tr.json b/packages/platform/lang/tr.json new file mode 100644 index 0000000000..c813db201c --- /dev/null +++ b/packages/platform/lang/tr.json @@ -0,0 +1,29 @@ +{ + "status": { + "LoadingPlugin": "{plugin} eklentisi yükleniyor...", + "UnknownError": "Bilinmeyen hata: {message}", + "InvalidId": "Geçersiz Id: {id}", + "BadRequest": "Hatalı istek", + "Forbidden": "Yasak", + "Conflict": "Çakışma", + "ExpiredLink": "Bu davet bağlantısının süresi dolmuş", + "Unauthorized": "Yetkisiz", + "UnknownMethod": "Bilinmeyen metod: {method}", + "InternalServerError": "Dahili sunucu hatası", + "MaintenanceWarning": "Bakım Planlandı:", + "MaintenanceWarningTime": "{time, plural, =1 {bir dakikadan az} other {# dakika}}", + "AccountNotFound": "Hesap bulunamadı veya girilen kimlik bilgileri yanlış", + "AccountNotConfirmed": "Hesap doğrulanmadı", + "WorkspaceNotFound": "Çalışma alanı bulunamadı", + "AccountAlreadyExists": "Hesap zaten mevcut", + "WorkspaceRateLimit": "Sunucu meşgul, Lütfen biraz bekleyin ve tekrar deneyin", + "AccountAlreadyConfirmed": "Hesap zaten doğrulandı", + "WorkspaceAlreadyExists": "Çalışma alanı zaten mevcut", + "InvalidOtp": "Geçersiz kod", + "InviteNotFound": "E-posta ile davet bulunamadı: {email}", + "WorkspaceLimitReached": "Çalışma alanı limitine ulaştınız. Lütfen bizimle iletişime geçin...", + "ReadOnlyAccount": "Anonim Misafir Demo", + "SystemAccount": "Sistem hesabı", + "SocialIdAlreadyExists": "Sosyal ID zaten mevcut" + } +} diff --git a/packages/presentation/lang/tr.json b/packages/presentation/lang/tr.json new file mode 100644 index 0000000000..75b2c50701 --- /dev/null +++ b/packages/presentation/lang/tr.json @@ -0,0 +1,61 @@ +{ + "string": { + "Create": "Oluştur", + "Cancel": "İptal", + "Ok": "Tamam", + "Save": "Kaydet", + "Saved": "Kaydedildi...", + "Download": "İndir", + "DownloadOriginal": "Orijinali indir", + "Delete": "Sil", + "Close": "Kapat", + "NotSelected": "Seçilmedi", + "Deselect": "Seçimi kaldır", + "Archived": "(arşivlendi)", + "AddSocialLinks": "Sosyal bağlantılar ekle", + "EditSocialLinks": "Sosyal bağlantıları düzenle", + "Change": "Değiştir", + "Remove": "Kaldır", + "Search": "Ara...", + "Spaces": "Alanlar", + "NumberSpaces": "{count, plural, =0 {İçinde} =1 {1 yerde} other {# yerde}}", + "InThis": "Bu {space} içinde", + "NoMatchesInThis": "Bu {space} içinde eşleşme yok", + "NoMatchesFound": "Eşleşme bulunamadı", + "NotInThis": "Bu {space} içinde değil", + "Match": "Eşleşme", + "Add": "Ekle", + "Edit": "Düzenle", + "DocumentPreview": "Önizleme", + "MakePrivate": "Özel yap", + "MakePrivateDescription": "Sadece üyeler görebilir", + "Created": "Oluşturuldu", + "Selected": "Seçildi", + "NoResults": "Gösterilecek sonuç yok", + "Next": "İleri", + "FailedToPreview": "Önizleme başarısız", + "ContentType": "İçerik türü", + "ContentTypeNotSupported": "Bu içerik türü için önizleme mevcut değil", + "StartDrawing": "Üzerine çiz", + "DrawingHistory": "Çizim geçmişi", + "ColorAdd": "Renk önayarı ekle", + "ColorRemove": "Renk önayarını kaldır", + "ColorReset": "Renk önayarlarını sıfırla", + "Copy": "Kopyala", + "DocumentUrlCopied": "Kopyalandı!", + "CopyLink": "Bağlantıyı kopyala", + "AccessDenied": "Nesne mevcut değil veya erişim izniniz yok.", + "UnableToFollowMention": "Bahsedilen nesne açılamıyor", + "Undo": "Geri al", + "Redo": "Yinele", + "ClearCanvas": "Tuvali temizle", + "PenTool": "Kalem aracı", + "EraserTool": "Silgi aracı", + "PanTool": "Kaydırma aracı", + "TextTool": "Metin aracı", + "PaletteManagementMenu": "Renk önayarlarını yönet" + }, + "status": { + "FileTooLarge": "Dosya çok büyük" + } +} diff --git a/packages/presentation/package.json b/packages/presentation/package.json index 62bd5e93cc..859147965a 100644 --- a/packages/presentation/package.json +++ b/packages/presentation/package.json @@ -61,11 +61,12 @@ "@hcengineering/emoji": "^0.6.0", "@hcengineering/theme": "^0.6.5", "@hcengineering/retry": "^0.6.0", + "@hcengineering/hulylake-client": "^0.6.0", "fast-equals": "^5.2.2", "png-chunks-extract": "^1.0.0", "svelte": "^4.2.20", "uuid": "^8.3.2", - "yjs": "^13.6.23" + "yjs": "^13.6.27" }, "repository": "https://github.com/hcengineering/platform", "publishConfig": { diff --git a/packages/presentation/src/communication.ts b/packages/presentation/src/communication.ts index 664818f37d..ad1d309d15 100644 --- a/packages/presentation/src/communication.ts +++ b/packages/presentation/src/communication.ts @@ -33,26 +33,24 @@ import { type UpdateAttachmentsOperation, type UpdateNotificationContextEvent, type UpdateNotificationEvent, - type UpdateNotificationQuery, + type NotificationQuery, type UpdatePatchEvent } from '@hcengineering/communication-sdk-types' import { - type AccountID, + type AccountUuid, type CardID, type CardType, type Collaborator, type ContextID, type FindCollaboratorsParams, type FindLabelsParams, - type FindMessagesGroupsParams, - type FindMessagesParams, type FindNotificationContextParams, type FindNotificationsParams, + type FindMessagesMetaParams, type Label, type Markdown, type Message, type MessageID, - type MessagesGroup, MessageType, type Notification, type NotificationContext, @@ -61,7 +59,12 @@ import { type AttachmentData, type AttachmentParams, type AttachmentUpdateData, - type WithTotal + type WithTotal, + type NotificationID, + type Emoji, + type MessageMeta, + type FindMessagesGroupParams, + type MessagesGroup } from '@hcengineering/communication-types' import core, { generateId, @@ -71,17 +74,19 @@ import core, { SocialIdType, type Tx, type TxDomainEvent, - AccountRole + AccountRole, + generateUuid } from '@hcengineering/core' import { onDestroy } from 'svelte' import { addNotification, NotificationSeverity, languageStore } from '@hcengineering/ui' -import { translate } from '@hcengineering/platform' +import { getMetadata, translate } from '@hcengineering/platform' import view from '@hcengineering/view' -import { v4 as uuid } from 'uuid' - -import { getCurrentWorkspaceUuid, getFilesUrl } from './file' -import { addTxListener, removeTxListener, type TxListener } from './utils' import { get } from 'svelte/store' +import { getClient as getHulylakeClient } from '@hcengineering/hulylake-client' + +import { getCurrentWorkspaceUuid } from './file' +import { addTxListener, removeTxListener, type TxListener } from './utils' +import presentation from './plugin' export { createCollaboratorsQuery, @@ -107,7 +112,12 @@ export async function setCommunicationClient (platformClient: PlatformClient): P client.close() } const _client = new Client(platformClient) - initLiveQueries(_client, getCurrentWorkspaceUuid(), getFilesUrl(), onDestroy) + + const token = getMetadata(presentation.metadata.Token) ?? '' + const hulylakeUrl = getMetadata(presentation.metadata.HulylakeUrl) ?? '' + const hulylake = getHulylakeClient(hulylakeUrl, getCurrentWorkspaceUuid(), token) + + initLiveQueries(_client, hulylake, onDestroy) client = _client onClientListeners.forEach((fn) => { fn() @@ -161,7 +171,7 @@ class Client { async createMessage (cardId: CardID, cardType: CardType, content: Markdown): Promise { const event: CreateMessageEvent = { type: MessageEventType.CreateMessage, - messageType: MessageType.Message, + messageType: MessageType.Text, cardId, cardType, content, @@ -198,28 +208,28 @@ class Client { await this.sendEvent(event) } - async addReaction (cardId: CardID, messageId: MessageID, reaction: string): Promise { + async addReaction (cardId: CardID, messageId: MessageID, emoji: Emoji): Promise { const event: ReactionPatchEvent = { type: MessageEventType.ReactionPatch, cardId, messageId, operation: { opcode: 'add', - reaction + reaction: emoji }, socialId: this.getSocialId() } await this.sendEvent(event) } - async removeReaction (cardId: CardID, messageId: MessageID, reaction: string): Promise { + async removeReaction (cardId: CardID, messageId: MessageID, emoji: Emoji): Promise { const event: ReactionPatchEvent = { type: MessageEventType.ReactionPatch, cardId, messageId, operation: { opcode: 'remove', - reaction + reaction: emoji }, socialId: this.getSocialId() } @@ -245,7 +255,7 @@ class Client { opcode: 'add', attachments: ops.add.map((it) => ({ ...it, - id: it.id ?? (uuid() as AttachmentID) + id: it.id ?? (generateUuid() as AttachmentID) })) }) } @@ -262,7 +272,7 @@ class Client { opcode: 'set', attachments: ops.set.map((it) => ({ ...it, - id: it.id ?? (uuid() as AttachmentID) + id: it.id ?? (generateUuid() as AttachmentID) })) }) } @@ -286,7 +296,7 @@ class Client { await this.sendEvent(event) } - async addCollaborators (cardId: CardID, cardType: CardType, collaborators: AccountID[]): Promise { + async addCollaborators (cardId: CardID, cardType: CardType, collaborators: AccountUuid[]): Promise { const event: AddCollaboratorsEvent = { type: NotificationEventType.AddCollaborators, cardId, @@ -297,7 +307,7 @@ class Client { await this.sendEvent(event) } - async removeCollaborators (cardId: CardID, cardType: CardType, collaborators: AccountID[]): Promise { + async removeCollaborators (cardId: CardID, cardType: CardType, collaborators: AccountUuid[]): Promise { const event: RemoveCollaboratorsEvent = { type: NotificationEventType.RemoveCollaborators, cardId, @@ -329,7 +339,11 @@ class Client { await this.sendEvent(event) } - async updateNotifications (contextId: ContextID, query: UpdateNotificationQuery, read: boolean): Promise { + async updateNotifications ( + contextId: ContextID, + query: Pick & { id?: NotificationID }, + read: boolean + ): Promise { const event: UpdateNotificationEvent = { type: NotificationEventType.UpdateNotification, contextId, @@ -342,15 +356,15 @@ class Client { await this.sendEvent(event) } - async findMessages (params: FindMessagesParams, queryId?: number): Promise { + async findMessagesMeta (params: FindMessagesMetaParams): Promise { return ( - await this.connection.domainRequest(COMMUNICATION, { - findMessages: { params, queryId } + await this.connection.domainRequest(COMMUNICATION, { + findMessagesMeta: { params } }) ).value } - async findMessagesGroups (params: FindMessagesGroupsParams): Promise { + async findMessagesGroups (params: FindMessagesGroupParams): Promise { return ( await this.connection.domainRequest(COMMUNICATION, { findMessagesGroups: { params } @@ -360,19 +374,22 @@ class Client { async findNotificationContexts ( params: FindNotificationContextParams, - queryId?: number + subscription?: number | string ): Promise { return ( await this.connection.domainRequest(COMMUNICATION, { - findNotificationContexts: { params, queryId } + findNotificationContexts: { params, subscription } }) ).value } - async findNotifications (params: FindNotificationsParams, queryId?: number): Promise> { + async findNotifications ( + params: FindNotificationsParams, + subscription?: number | string + ): Promise> { return ( await this.connection.domainRequest>(COMMUNICATION, { - findNotifications: { params, queryId } + findNotifications: { params, subscription } }) ).value } @@ -393,9 +410,15 @@ class Client { ).value } - async unsubscribeQuery (id: number): Promise { + async subscribeCard (cardId: CardID, subscription: string | number): Promise { await this.connection.domainRequest(COMMUNICATION, { - unsubscribeQuery: id + subscribeCard: { cardId, subscription } + }) + } + + async unsubscribeCard (cardId: CardID, subscription: string | number): Promise { + await this.connection.domainRequest(COMMUNICATION, { + unsubscribeCard: { cardId, subscription } }) } @@ -438,7 +461,7 @@ class Client { return id } - private getAccount (): AccountID { + private getAccount (): AccountUuid { return getCurrentAccount().uuid } } diff --git a/packages/presentation/src/components/DocPopup.svelte b/packages/presentation/src/components/DocPopup.svelte index 24d3ad34b8..fe5519bc9c 100644 --- a/packages/presentation/src/components/DocPopup.svelte +++ b/packages/presentation/src/components/DocPopup.svelte @@ -79,14 +79,11 @@ findObjectPresenter(_class) } - const checkSelected = (item?: Doc): void => { - if (item === undefined) { - return - } - if (selectedElements.has(item._id)) { - selectedElements.delete(item._id) + const checkSelected = (_id: Ref): void => { + if (selectedElements.has(_id)) { + selectedElements.delete(_id) } else { - selectedElements.add(item._id) + selectedElements.add(_id) } selectedObjects = Array.from(selectedElements) @@ -97,12 +94,16 @@ let selection = 0 let list: ListView - async function handleSelection (evt: Event | undefined, objects: Doc[], selection: number): Promise { + function handleSelection (evt: Event | undefined, objects: Doc[], selection: number): void { const item = objects[selection] if (item === undefined) { return } + select(item) + } + + function select (item: Doc): void { if (!multiSelect) { if (allowDeselect) { selected = item._id === selected ? undefined : item._id @@ -111,7 +112,7 @@ } dispatch(closeAfterSelect ? 'close' : 'update', selected !== undefined ? item : undefined) } else { - checkSelected(item) + checkSelected(item._id) } } @@ -129,27 +130,35 @@ if (key.code === 'Enter') { key.preventDefault() key.stopPropagation() - void handleSelection(key, objects, selection) + handleSelection(key, objects, selection) } } const manager = createFocusManager() - function onCreate (): void { + async function onCreate (): Promise { if (create === undefined) { return } - const c = create - showPopup(c.component, c.props ?? {}, 'top', async (res) => { + const handler = async (res: Ref | undefined) => { if (res != null) { // We expect reference to new object. - const newPerson = await getClient().findOne(_class, { _id: res }) - if (newPerson !== undefined) { - search = c.update?.(newPerson) ?? '' - dispatch('created', newPerson) - dispatch('search', search) + const newObject = await getClient().findOne(_class, { _id: res }) + if (newObject !== undefined) { + dispatch('created', newObject) + select(newObject) } } - }) + } + const c = create + if (c.component !== undefined) { + showPopup(c.component, c.props ?? {}, 'top', handler) + } else if (c.func !== undefined) { + const impl = await getResource(c.func) + if (impl !== undefined) { + const newObjectId = await impl(c.props) + await handler(newObjectId) + } + } } function toAny (obj: any): any { return obj @@ -248,7 +257,7 @@ class="menu-item withList w-full flex-row-center" disabled={readonly || isDeselectDisabled || loading} on:click={() => { - void handleSelection(undefined, objects, item) + handleSelection(undefined, objects, item) }} > {#if type === 'text'} diff --git a/packages/presentation/src/plugin.ts b/packages/presentation/src/plugin.ts index 295594569c..b52c3d7893 100644 --- a/packages/presentation/src/plugin.ts +++ b/packages/presentation/src/plugin.ts @@ -180,7 +180,8 @@ export default plugin(presentationId, { StatsUrl: '' as Metadata, MailUrl: '' as Metadata, PreviewUrl: '' as Metadata, - PulseUrl: '' as Metadata + PulseUrl: '' as Metadata, + HulylakeUrl: '' as Metadata }, status: { FileTooLarge: '' as StatusCode diff --git a/packages/presentation/src/types.ts b/packages/presentation/src/types.ts index 5f7ede44e3..3bf75bf463 100644 --- a/packages/presentation/src/types.ts +++ b/packages/presentation/src/types.ts @@ -35,10 +35,11 @@ export interface ObjectSearchResult { * @public */ export interface ObjectCreate { - component: AnyComponent + component: AnyComponent | undefined props?: Record label: IntlString update?: (doc: Doc) => string + func?: Resource<(props?: Record) => Promise | undefined>> } /** diff --git a/packages/text-core/package.json b/packages/text-core/package.json index a97d00fb6f..f19ac1979f 100644 --- a/packages/text-core/package.json +++ b/packages/text-core/package.json @@ -40,7 +40,8 @@ }, "dependencies": { "@hcengineering/core": "^0.6.32", - "fast-equals": "^5.2.2" + "fast-equals": "^5.2.2", + "hash-it": "^6.0.0" }, "repository": "https://github.com/hcengineering/platform", "publishConfig": { diff --git a/packages/text-core/src/markup/__tests__/utils.test.ts b/packages/text-core/src/markup/__tests__/utils.test.ts new file mode 100644 index 0000000000..740aa1c64f --- /dev/null +++ b/packages/text-core/src/markup/__tests__/utils.test.ts @@ -0,0 +1,49 @@ +import { hashAttrs, stripHash } from '../utils' + +describe('hashAttrs', () => { + it('should return a hash of length 8', () => { + const attrs = { a: 1 } + const hash = hashAttrs(attrs) + expect(hash.length).toEqual(8) + }) + it('should return the same hash for the same attrs', () => { + const attrs = { a: 1, b: 2 } + const hash1 = hashAttrs(attrs) + const hash2 = hashAttrs(attrs) + expect(hash1).toEqual(hash2) + }) + + it('should return different hashes for different attrs', () => { + const attrs1 = { a: 1, b: 2 } + const attrs2 = { a: 1, b: 3 } + const hash1 = hashAttrs(attrs1) + const hash2 = hashAttrs(attrs2) + expect(hash1).not.toEqual(hash2) + }) +}) + +describe('stripHash', () => { + it('should return the name without the hash', () => { + const name = 'bold--c0decafe' + const result = stripHash(name) + expect(result).toEqual('bold') + }) + + it('should return the original name if no hash is present', () => { + const name = 'bold' + const result = stripHash(name) + expect(result).toEqual(name) + }) + + it('should return the original name if the hash is not 8 characters long', () => { + const name = 'bold--1234567' + const result = stripHash(name) + expect(result).toEqual(name) + }) + + it('should return the original name if the hash is not a valid base64 string', () => { + const name = 'bold--invalid!' + const result = stripHash(name) + expect(result).toEqual(name) + }) +}) diff --git a/packages/text-core/src/markup/utils.ts b/packages/text-core/src/markup/utils.ts index 7b187aac46..dd5efd7630 100644 --- a/packages/text-core/src/markup/utils.ts +++ b/packages/text-core/src/markup/utils.ts @@ -16,9 +16,11 @@ import { Markup } from '@hcengineering/core' import { deepEqual } from 'fast-equals' +import hashIt from 'hash-it' + import { nodeDoc, nodeParagraph, nodeText } from './dsl' -import { MarkupMark, MarkupNode, MarkupNodeType, emptyMarkupNode } from './model' -import { traverseNode } from './traverse' +import { MarkupMark, MarkupMarkType, MarkupNode, MarkupNodeType, emptyMarkupNode } from './model' +import { traverseAllMarks, traverseNode } from './traverse' /** @public */ export const EmptyMarkup: Markup = jsonToMarkup(emptyMarkupNode()) @@ -124,7 +126,11 @@ export function markupToJSON (markup: Markup): MarkupNode { // But there seem to be some cases when it contains HTML or plain text // So we need to handle those cases and produce valid MarkupNode if (markup.startsWith('{')) { - return JSON.parse(markup) as MarkupNode + const json = JSON.parse(markup) as MarkupNode + traverseAllMarks(json, (node, mark) => { + mark.type = stripHash(mark.type) as MarkupMarkType + }) + return json } else { return nodeDoc(nodeParagraph(nodeText(markup))) } @@ -207,3 +213,17 @@ export function markupToText (markup: Markup): string { return fragments.join('').trim() } + +// see https://github.com/yjs/y-prosemirror/blob/master/src/lib.js#L402 +const hashedMarkNameRegex = /(.*)(--[a-zA-Z0-9+/=]{8})$/ + +/** @public */ +export function stripHash (attrName: string): string { + return hashedMarkNameRegex.exec(attrName)?.[1] ?? attrName +} + +/** @public */ +export function hashAttrs (attrs: any): string { + const hash = hashIt(attrs) + return (hash >>> 0).toString(16).padStart(8, '0') +} diff --git a/packages/text-ydoc/package.json b/packages/text-ydoc/package.json index 4f476f5423..0d55175375 100644 --- a/packages/text-ydoc/package.json +++ b/packages/text-ydoc/package.json @@ -37,12 +37,13 @@ "@types/jest": "^29.5.5", "jest-environment-jsdom": "^29.7.0", "fast-equals": "^5.2.2", - "y-prosemirror": "^1.3.6" + "y-prosemirror": "^1.3.7" }, "dependencies": { "@hcengineering/core": "^0.6.32", "@hcengineering/text": "^0.6.5", - "yjs": "^13.6.23" + "@hcengineering/text-core": "^0.6.0", + "yjs": "^13.6.27" }, "repository": "https://github.com/hcengineering/platform", "publishConfig": { diff --git a/packages/text-ydoc/src/__tests__/ydoc.test.ts b/packages/text-ydoc/src/__tests__/ydoc.test.ts index 3b6a99bd23..43d6f6fab5 100644 --- a/packages/text-ydoc/src/__tests__/ydoc.test.ts +++ b/packages/text-ydoc/src/__tests__/ydoc.test.ts @@ -25,6 +25,7 @@ declare global { namespace jest { interface Matchers { toEqualMarkup: (expected: string) => R + toEqualYdoc: (expected: YDoc) => R } } } @@ -35,8 +36,22 @@ expect.extend({ return { message: () => pass - ? `Expected markup strings NOT to be equal:\n Received: ${received}\n Expected: ${expected}` - : `Expected markup strings to be equal:\n Received: ${received}\n Expected: ${expected}`, + ? `Expected markup strings NOT to be equal:\n Expected: ${expected}\n Received: ${received}` + : `Expected markup strings to be equal:\n Expected: ${expected}\n Received: ${received}`, + pass + } + }, + + toEqualYdoc (received: YDoc, expected: YDoc) { + const expectedJSON = expected.toJSON() + const receivedJSON = received.toJSON() + + const pass = deepEqual(expectedJSON, receivedJSON) + return { + message: () => + pass + ? `Expected yjs documents NOT to be equal:\n Expected: ${JSON.stringify(expectedJSON)}\n Received: ${JSON.stringify(receivedJSON)}` + : `Expected yjs documents to be equal:\n Expected: ${JSON.stringify(expectedJSON)}\n Received: ${JSON.stringify(receivedJSON)}`, pass } } @@ -54,52 +69,157 @@ function referenceYDocToMarkup (ydoc: YDoc, field: string): Markup { return jsonToMarkup(json as MarkupNode) } -const markups: Array<[string, Markup]> = [ - ['text', '{"type":"doc","content":[{"type":"paragraph","content":[{"type":"text","text":"hello world"}]}]}'], - [ - 'text with bold mark', - '{"type":"doc","content":[{"type":"paragraph","content":[{"type":"text","marks":[{"type":"bold","attrs":{}}],"text":"hello world"}]}]}' - ], - [ - 'separate paragraphs with bold mark', - '{"type":"doc","content":[{"type":"paragraph","content":[{"type":"text","marks":[{"type":"bold","attrs":{}}],"text":"hello"}]},{"type":"paragraph","content":[{"type":"text","marks":[{"type":"bold","attrs":{}}],"text":"world"}]}]}' - ], - [ - 'mixed text and text with bold mark', - '{"type":"doc","content":[{"type":"paragraph","content":[{"type":"text","text":"hello "},{"type":"text","marks":[{"type":"bold","attrs":{}}],"text":"world"}]}]}' - ], - [ - 'mixed text with italic and text with bold and italic marks', - '{"type":"doc","content":[{"type":"paragraph","content":[{"type":"text","marks":[{"type":"italic","attrs":{}}],"text":"hello "},{"type":"text","marks":[{"type":"bold","attrs":{}},{"type":"italic","attrs":{}}],"text":"world"}]}]}' - ], - [ - 'text with link and italic marks', - '{"type":"doc","content":[{"type":"paragraph","content":[{"type":"text","text":"hello "},{"type":"text","text":"hello world","marks":[{"type":"link","attrs":{"href":"http://example.com","target":"_blank","rel":"noopener noreferrer","class":"cursor-pointer"}},{"type":"italic","attrs":{}}]}]}]}' - ], - [ - 'image', - '{"type":"doc","content":[{"type":"paragraph","content":[{"type":"image","attrs":{"src":"http://example.com/image.jpg","alt":"image"}}]}]}' - ], - [ - 'table with formatting inside', - '{"type":"doc","content":[{"type":"table","content":[{"type":"tableRow","content":[{"type":"tableCell","attrs":{"colspan":1,"rowspan":1},"content":[{"type":"paragraph","content":[{"type":"text","marks":[{"type":"bold","attrs":{}}],"text":"1"}]}]},{"type":"tableCell","attrs":{"colspan":1,"rowspan":1},"content":[{"type":"paragraph","content":[{"type":"text","marks":[{"type":"italic","attrs":{}}],"text":"2"}]}]}]},{"type":"tableRow","content":[{"type":"tableCell","attrs":{"colspan":1,"rowspan":1},"content":[{"type":"codeBlock","content":[{"type":"text","text":"3"}]}]},{"type":"tableCell","attrs":{"colspan":1,"rowspan":1},"content":[{"type":"paragraph","content":[{"type":"text","text":"4"}]}]}]}]}]}' +const markups: Array<{ name: string, markup: Markup, skipYdocCompare?: boolean }> = [ + { + name: 'text', + markup: '{"type":"doc","content":[{"type":"paragraph","content":[{"type":"text","text":"hello world"}]}]}' + }, + { + name: 'text with bold mark', + markup: + '{"type":"doc","content":[{"type":"paragraph","content":[{"type":"text","marks":[{"type":"bold","attrs":{}}],"text":"hello world"}]}]}' + }, + { + name: 'separate paragraphs with bold mark', + markup: + '{"type":"doc","content":[{"type":"paragraph","content":[{"type":"text","marks":[{"type":"bold","attrs":{}}],"text":"hello"}]},{"type":"paragraph","content":[{"type":"text","marks":[{"type":"bold","attrs":{}}],"text":"world"}]}]}' + }, + { + name: 'mixed text and text with bold mark', + markup: + '{"type":"doc","content":[{"type":"paragraph","content":[{"type":"text","text":"hello "},{"type":"text","marks":[{"type":"bold","attrs":{}}],"text":"world"}]}]}' + }, + { + name: 'mixed text with italic and text with bold and italic marks', + markup: + '{"type":"doc","content":[{"type":"paragraph","content":[{"type":"text","marks":[{"type":"italic","attrs":{}}],"text":"hello "},{"type":"text","marks":[{"type":"bold","attrs":{}},{"type":"italic","attrs":{}}],"text":"world"}]}]}' + }, + { + name: 'text with link and italic marks', + markup: + '{"type":"doc","content":[{"type":"paragraph","content":[{"type":"text","text":"hello "},{"type":"text","text":"hello world","marks":[{"type":"link","attrs":{"href":"http://example.com","target":"_blank","rel":"noopener noreferrer","class":"cursor-pointer"}},{"type":"italic","attrs":{}}]}]}]}' + }, + { + name: 'image', + markup: + '{"type":"doc","content":[{"type":"paragraph","content":[{"type":"image","attrs":{"src":"http://example.com/image.jpg","alt":"image"}}]}]}' + }, + { + name: 'table with formatting inside', + markup: + '{"type":"doc","content":[{"type":"table","content":[{"type":"tableRow","content":[{"type":"tableCell","attrs":{"colspan":1,"rowspan":1},"content":[{"type":"paragraph","content":[{"type":"text","marks":[{"type":"bold","attrs":{}}],"text":"1"}]}]},{"type":"tableCell","attrs":{"colspan":1,"rowspan":1},"content":[{"type":"paragraph","content":[{"type":"text","marks":[{"type":"italic","attrs":{}}],"text":"2"}]}]}]},{"type":"tableRow","content":[{"type":"tableCell","attrs":{"colspan":1,"rowspan":1},"content":[{"type":"codeBlock","content":[{"type":"text","text":"3"}]}]},{"type":"tableCell","attrs":{"colspan":1,"rowspan":1},"content":[{"type":"paragraph","content":[{"type":"text","text":"4"}]}]}]}]}]}' + }, + { + name: 'non-overlapping marks', + markup: `{ + "type": "doc", + "content": [ + { + "type": "paragraph", + "content": [ + { + "type": "text", + "text": "xy", + "marks": [ + { + "type": "inline-comment", + "attrs": { + "thread": "1" + } + } + ] + }, + { + "type": "text", + "text": "z", + "marks": [ + { + "type": "inline-comment", + "attrs": { + "thread": "2" + } + } + ] + } + ] + } ] +}`, + skipYdocCompare: true + }, + { + name: 'overlapping marks', + markup: `{ + "type": "doc", + "content": [ + { + "type": "paragraph", + "content": [ + { + "type": "text", + "text": "x", + "marks": [ + { + "type": "inline-comment", + "attrs": { + "thread": "1" + } + } + ] + }, + { + "type": "text", + "text": "y", + "marks": [ + { + "type": "inline-comment", + "attrs": { + "thread": "1" + } + }, + { + "type": "inline-comment", + "attrs": { + "thread": "2" + } + } + ] + }, + { + "type": "text", + "text": "z", + "marks": [ + { + "type": "inline-comment", + "attrs": { + "thread": "2" + } + } + ] + } + ] + } + ] +}`, + skipYdocCompare: true + } ] describe('markupToYDoc', () => { - describe.each(markups)('compare with reference', (name, markup) => { - it(name, () => { - const expected = referenceMarkupToYDoc(markup, 'test') - const actual = markupToYDoc(markup, 'test') - expect(actual.toJSON()).toEqual(expected.toJSON()) - }) + describe.each(markups)('compare with reference', ({ name, markup, skipYdocCompare }) => { + if (skipYdocCompare !== true) { + it(name, () => { + const expected = referenceMarkupToYDoc(markup, 'test') + const actual = markupToYDoc(markup, 'test') + expect(actual).toEqualYdoc(expected) + }) + } }) - describe.each(markups)('converts markup to ydoc and back', (name, markup) => { + describe.each(markups)('converts markup to ydoc and back', ({ name, markup }) => { it(name, () => { - console.log(markup, name) const ydoc = markupToYDoc(markup, 'test') - const actual = referenceYDocToMarkup(ydoc, 'test') + const actual = yDocToMarkup(ydoc, 'test') expect(actual).toEqualMarkup(markup) }) @@ -107,7 +227,7 @@ describe('markupToYDoc', () => { }) describe('yDocToMarkup', () => { - describe.each(markups)('compare with original', (name, markup) => { + describe.each(markups)('compare with original', ({ name, markup }) => { it(name, () => { const ydoc = referenceMarkupToYDoc(markup, 'test') const actual = yDocToMarkup(ydoc, 'test') @@ -116,7 +236,7 @@ describe('yDocToMarkup', () => { }) }) - describe.each(markups)('compare with reference', (name, markup) => { + describe.each(markups)('compare with reference', ({ name, markup }) => { it(name, () => { const ydoc = referenceMarkupToYDoc(markup, 'test') const expected = referenceYDocToMarkup(ydoc, 'test') @@ -126,12 +246,14 @@ describe('yDocToMarkup', () => { }) }) - describe.each(markups)('converts ydoc to markup and back', (name, markup) => { - it(name, () => { - const expected = referenceMarkupToYDoc(markup, 'test') - const actual = referenceMarkupToYDoc(yDocToMarkup(expected, 'test'), 'test') + describe.each(markups)('converts ydoc to markup and back', ({ name, markup, skipYdocCompare }) => { + if (skipYdocCompare !== true) { + it(name, () => { + const expected = referenceMarkupToYDoc(markup, 'test') + const actual = referenceMarkupToYDoc(yDocToMarkup(expected, 'test'), 'test') - expect(actual.toJSON()).toEqual(expected.toJSON()) - }) + expect(actual).toEqualYdoc(expected) + }) + } }) }) diff --git a/packages/text-ydoc/src/ydoc.ts b/packages/text-ydoc/src/ydoc.ts index 937ac86fc8..811fa34dc8 100644 --- a/packages/text-ydoc/src/ydoc.ts +++ b/packages/text-ydoc/src/ydoc.ts @@ -15,6 +15,7 @@ import { generateId, Markup } from '@hcengineering/core' import { jsonToMarkup, MarkupMarkType, MarkupNodeType, markupToJSON, type MarkupNode } from '@hcengineering/text' +import { hashAttrs, stripHash } from '@hcengineering/text-core' import { Doc as YDoc, XmlElement as YXmlElement, XmlFragment as YXmlFragment, XmlText as YXmlText } from 'yjs' /** @@ -49,14 +50,22 @@ function nodeToXmlElement (parent: YXmlFragment, node: MarkupNode): YXmlElement if (node.content !== undefined && node.content.length > 0) { node.content.map((p) => nodeToXmlElement(elem, p)) } - } else { + } else if (elem instanceof YXmlText) { // https://github.com/yjs/y-prosemirror/blob/master/src/plugins/sync-plugin.js#L777 const attributes: Record = {} if (node.marks !== undefined) { + const attrCount = new Map() node.marks.forEach((mark) => { - attributes[mark.type] = mark.attrs ?? {} + attrCount.set(mark.type, (attrCount.get(mark.type) ?? 0) + 1) + }) + + node.marks.forEach((mark) => { + const count = attrCount.get(mark.type) ?? 0 + const type = count > 1 ? `${mark.type}--${hashAttrs(mark.attrs)}` : mark.type + attributes[type] = mark.attrs ?? {} }) } + elem.applyDelta([ { insert: node.text ?? '', @@ -119,7 +128,7 @@ function xmlFragmentToNode (fragment: YXmlFragment): MarkupNode[] { // Convert attributes to marks if (op.attributes != null) { textNode.marks = Object.entries(op.attributes).map(([type, attrs]) => ({ - type: type as MarkupMarkType, + type: stripHash(type) as MarkupMarkType, attrs: attrs as Record })) } diff --git a/packages/theme/styles/_layouts.scss b/packages/theme/styles/_layouts.scss index efc6754a2e..e1c0c7c1de 100644 --- a/packages/theme/styles/_layouts.scss +++ b/packages/theme/styles/_layouts.scss @@ -561,6 +561,7 @@ input.search { .mx-2 { margin: 0 .5rem; } .mx-3 { margin: 0 .75rem; } .mx-4 { margin: 0 1rem; } +.mx-8 { margin: 0 2rem; } .mx-10 { margin: 0 2.5rem; } .mx-auto { margin: 0 auto; } .my-1 { margin: .25rem 0; } diff --git a/packages/theme/styles/_text-editor.scss b/packages/theme/styles/_text-editor.scss index 7fca2d4a57..e33278dfa1 100644 --- a/packages/theme/styles/_text-editor.scss +++ b/packages/theme/styles/_text-editor.scss @@ -303,6 +303,7 @@ .text-editor-image-container { img { max-width: 100%; + height: auto; } } diff --git a/packages/ui/lang/cs.json b/packages/ui/lang/cs.json index 704862577a..7698769d63 100644 --- a/packages/ui/lang/cs.json +++ b/packages/ui/lang/cs.json @@ -57,6 +57,7 @@ "Czech": "Čeština", "German": "Deutsch", "Japanese": "日本語", + "Turkish": "Türkçe", "MinutesBefore": "{minutes, plural, =1 {1 minuta před} other {# minut před}}", "HoursBefore": "{hours, plural, =1 {1 hodina před} other {# hodin před}}", "DaysBefore": "{days, plural, =1 {1 den před} other {# dní před}}", diff --git a/packages/ui/lang/de.json b/packages/ui/lang/de.json index 55d8a0d147..638f70c222 100644 --- a/packages/ui/lang/de.json +++ b/packages/ui/lang/de.json @@ -57,6 +57,7 @@ "Czech": "Tschechisch", "German": "Deutsch", "Japanese": "Japanisch", + "Turkish": "Türkçe", "MinutesBefore": "{minutes, plural, =1 {eine Minute vorher} other {# Minuten vorher}}", "HoursBefore": "{hours, plural, =1 {eine Stunde vorher} other {# Stunden vorher}}", "DaysBefore": "{days, plural, =1 {einen Tag vorher} other {# Tage vorher}}", diff --git a/packages/ui/lang/en.json b/packages/ui/lang/en.json index a7f6282a17..7c325e107f 100644 --- a/packages/ui/lang/en.json +++ b/packages/ui/lang/en.json @@ -57,6 +57,7 @@ "Czech": "Čeština", "German": "Deutsch", "Japanese": "日本語", + "Turkish": "Türkçe", "MinutesBefore": "{minutes, plural, =1 {a minute before} other {# minutes before}}", "HoursBefore": "{hours, plural, =1 {an hour before} other {# hours before}}", "DaysBefore": "{days, plural, =1 {a day before} other {# days before}}", diff --git a/packages/ui/lang/es.json b/packages/ui/lang/es.json index 1f8fece65e..81e01a8627 100644 --- a/packages/ui/lang/es.json +++ b/packages/ui/lang/es.json @@ -57,6 +57,7 @@ "Czech": "Čeština", "German": "Deutsch", "Japanese": "日本語", + "Turkish": "Türkçe", "MinutesBefore": "{minutes, plural, =1 {un minuto antes} other {# minutos antes}}", "HoursBefore": "{hours, plural, =1 {una hora antes} other {# horas antes}}", "DaysBefore": "{days, plural, =1 {un día antes} other {# días antes}}", diff --git a/packages/ui/lang/fr.json b/packages/ui/lang/fr.json index 5081fc70be..2de9794825 100644 --- a/packages/ui/lang/fr.json +++ b/packages/ui/lang/fr.json @@ -57,6 +57,7 @@ "Czech": "Čeština", "German": "Deutsch", "Japanese": "日本語", + "Turkish": "Türkçe", "MinutesBefore": "{minutes, plural, =1 {une minute avant} other {# minutes avant}}", "HoursBefore": "{hours, plural, =1 {une heure avant} other {# heures avant}}", "DaysBefore": "{days, plural, =1 {un jour avant} other {# jours avant}}", diff --git a/packages/ui/lang/it.json b/packages/ui/lang/it.json index 15c212ddba..0854a3f1f4 100644 --- a/packages/ui/lang/it.json +++ b/packages/ui/lang/it.json @@ -57,6 +57,7 @@ "Czech": "Čeština", "German": "Deutsch", "Japanese": "日本語", + "Turkish": "Türkçe", "MinutesBefore": "{minutes, plural, =1 {un minuto prima} other {# minuti prima}}", "HoursBefore": "{hours, plural, =1 {un'ora prima} other {# ore prima}}", "DaysBefore": "{days, plural, =1 {un giorno prima} other {# giorni prima}}", diff --git a/packages/ui/lang/ja.json b/packages/ui/lang/ja.json index c6d9531c15..902609e4a9 100644 --- a/packages/ui/lang/ja.json +++ b/packages/ui/lang/ja.json @@ -57,6 +57,7 @@ "Czech": "Čeština", "German": "Deutsch", "Japanese": "日本語", + "Turkish": "Türkçe", "MinutesBefore": "{minutes, plural, =1 {1分前} other {#分前}}", "HoursBefore": "{hours, plural, =1 {1時間前} other {#時間前}}", "DaysBefore": "{days, plural, =1 {1日前} other {#日前}}", diff --git a/packages/ui/lang/pt.json b/packages/ui/lang/pt.json index 8e08ad8965..116b30fbb7 100644 --- a/packages/ui/lang/pt.json +++ b/packages/ui/lang/pt.json @@ -57,6 +57,7 @@ "Czech": "Čeština", "German": "Deutsch", "Japanese": "日本語", + "Turkish": "Türkçe", "MinutesBefore": "{minutes, plural, =1 {um minuto antes} other {# minutos antes}}", "HoursBefore": "{hours, plural, =1 {uma hora antes} other {# horas antes}}", "DaysBefore": "{days, plural, =1 {um dia antes} other {# dias antes}}", diff --git a/packages/ui/lang/ru.json b/packages/ui/lang/ru.json index 081716b7b2..28145e035b 100644 --- a/packages/ui/lang/ru.json +++ b/packages/ui/lang/ru.json @@ -57,6 +57,7 @@ "Czech": "Čeština", "German": "Deutsch", "Japanese": "日本語", + "Turkish": "Türkçe", "MinutesBefore": "{minutes, plural, =1 {за минуту} one {за # минуту} few {за # минуты} other {за # минут}}", "HoursBefore": "{hours, plural, =1 {за час} one {за # час} few {за # часа} other {за # часов}}", "DaysBefore": "{days, plural, =1 {за день} one {за # день} few {за # дня} other {за # дней}}", diff --git a/packages/ui/lang/tr.json b/packages/ui/lang/tr.json new file mode 100644 index 0000000000..b6b406f3e9 --- /dev/null +++ b/packages/ui/lang/tr.json @@ -0,0 +1,113 @@ +{ + "string": { + "EditBoxPlaceholder": "Metin yazın...", + "Ok": "Tamam", + "Cancel": "İptal", + "Save": "Kaydet", + "Publish": "Yayınla", + "SaveDraft": "Taslak kaydet", + "MinutesAgo": "{minutes, plural, =0 {bir dakikadan az önce} =1 {bir dakika önce} other {# dakika önce}}", + "HoursAgo": "{hours, plural, =0 {bir saatten az önce} =1 {bir saat önce} other {# saat önce}}", + "DaysAgo": "{days, plural, =0 {bugün} =1 {dün} other {# gün önce}}", + "MonthsAgo": "{months, plural, =0 {bu ay} =1 {bir ay önce} other {# ay önce}}", + "YearsAgo": "{years, plural, =0 {bu yıl} =1 {bir yıl önce} other {# yıl önce}}", + "Minutes": "{minutes, plural, =0 {bir dakikadan az} =1 {bir dakika} other {# dakika}}", + "Hours": "{hours, plural, =0 {bir saatten az} =1 {bir saat} other {# saat}}", + "Days": "{days, plural, =0 {bugün} =1 {1 gün} other {# gün}}", + "Weeks": "{weeks, plural, =0 {bu hafta} =1 {1 hafta} other {# hafta}}", + "Months": "{months, plural, =0 {bu ay} =1 {1 ay} other {# ay}}", + "Years": "{years, plural, =0 {bu yıl} =1 {bir yıl} other {# yıl}}", + "Before": "Önce", + "After": "Sonra", + "MinutesShort": "{value}dk", + "HoursShort": "{value}sa", + "DaysShort": "{value}g", + "ShowMore": "Daha fazla göster", + "ShowLess": "Daha az göster", + "Search": "Ara", + "SearchDots": "Ara...", + "SearchResults": "Arama Sonuçları", + "Suggested": "Önerilen", + "TimeTooltip": "{value}", + "SelectDate": "Tarih seç", + "None": "Hiçbiri", + "NotSelected": "Seçilmedi", + "Today": "Bugün", + "NoDate": "Tarih yok", + "StartDate": "Başlangıç tarihi", + "TargetDate": "Hedef tarih", + "Overdue": "Gecikmiş", + "DueDate": "Bitiş tarihi", + "AddDueDate": "Bitiş tarihi ekle", + "SetDueDate": "Bitiş tarihi belirle", + "EditDueDate": "Bitiş tarihini düzenle", + "SaveDueDate": "Bitiş tarihini kaydet", + "NeedsToBeCompletedByThisDate": "Bu tarihe kadar tamamlanmalı", + "DueDatePopupTitle": "Bitiş: {value}", + "DueDatePopupOverdueTitle": "Bitiş tarihiydi: {value}", + "DueDatePopupDescription": "{value, plural, =0 {Bugün} =1 {Yarın} other {# gün kaldı}}", + "DueDatePopupOverdueDescription": "{value, plural, =1 {1 gün gecikti} other {# gün gecikti}}", + "English": "English", + "Russian": "Русский", + "Portuguese": "Português", + "Spanish": "Español", + "Chinese": "中文", + "French": "Français", + "Italian": "Italiano", + "Czech": "Čeština", + "German": "Deutsch", + "Japanese": "日本語", + "Turkish": "Türkçe", + "MinutesBefore": "{minutes, plural, =1 {bir dakika önce} other {# dakika önce}}", + "HoursBefore": "{hours, plural, =1 {bir saat önce} other {# saat önce}}", + "DaysBefore": "{days, plural, =1 {bir gün önce} other {# gün önce}}", + "WeeksBefore": "{weeks, plural, =1 {bir hafta önce} other {# hafta önce}}", + "MonthsBefore": "{months, plural, =1 {bir ay önce} other {# ay önce}}", + "MinutesAfter": "{minutes, plural, =1 {bir dakika sonra} other {# dakika sonra}}", + "HoursAfter": "{hours, plural, =1 {bir saat sonra} other {# saat sonra}}", + "DaysAfter": "{days, plural, =1 {bir gün sonra} other {# gün sonra}}", + "WeeksAfter": "{weeks, plural, =1 {bir hafta sonra} other {# hafta sonra}}", + "MonthsAfter": "{months, plural, =1 {bir ay sonra} other {# ay sonra}}", + "NoActionsDefined": "Uygulanabilir işlem yok", + "Incoming": "Gelen", + "HoursLabel": "Saat", + "Back": "Geri", + "Next": "İleri", + "DropdownDefaultLabel": "Öğe Seç", + "DD": "GG", + "MM": "AA", + "YYYY": "YYYY", + "HH": "SS", + "Remove": "Kaldır", + "NoResults": "Sonuç Yok", + "MoreCount": "{count} daha", + "Spacious": "Geniş", + "Compact": "Kompakt", + "ThemeLight": "Açık", + "ThemeDark": "Koyu", + "ThemeSystem": "Sistem", + "NoTimeZonesFound": "Zaman dilimi bulunamadı", + "Selected": "Seçildi:", + "Submit": "Gönder", + "NextStep": "Sonraki adım", + "TypeHere": "Buraya yazın...", + "NormalSize": "Normal boyut", + "FullSize": "Tam boyut", + "UseMaxWidth": "Maksimum genişlik", + "Sidebar": "Kenar çubuğu", + "FontSize": "Yazı boyutu", + "Language": "Dil", + "DaysWOValue": "{days, plural, =1 {gün} other {gün}}", + "WeeksWOValue": "{weeks, plural, =1 {hafta} other {hafta}}", + "MonthsWOValue": "{months, plural, =1 {ay} other {ay}}", + "Filter": "Filtre", + "Clear": "Temizle", + "Yesterday": "Dün", + "ThisWeek": "Bu hafta", + "ThisMonth": "Bu ay", + "ThisYear": "Bu yıl", + "EmojiStyle": "Emoji Stili", + "EmojiSystem": "Sistem Varsayılanı", + "EmojiNoto": "Noto Color" + } +} diff --git a/packages/ui/lang/zh.json b/packages/ui/lang/zh.json index 0cab25fd23..2627632a58 100644 --- a/packages/ui/lang/zh.json +++ b/packages/ui/lang/zh.json @@ -57,6 +57,7 @@ "Czech": "Čeština", "German": "Deutsch", "Japanese": "日本語", + "Turkish": "Türkçe", "MinutesBefore": "{minutes, plural, =1 {一分钟前} other {# 分钟前}}", "HoursBefore": "{hours, plural, =1 {一小时前} other {# 小时前}}", "DaysBefore": "{days, plural, =1 {一天前} other {# 天前}}", diff --git a/packages/ui/src/components/EditBox.svelte b/packages/ui/src/components/EditBox.svelte index a4938fc579..f80ac3f02f 100644 --- a/packages/ui/src/components/EditBox.svelte +++ b/packages/ui/src/components/EditBox.svelte @@ -31,6 +31,8 @@ export let placeholderParam: any | undefined = undefined export let format: 'text' | 'password' | 'number' | 'text-multiline' = 'text' export let maxDigitsAfterPoint: number | undefined = undefined + export let minValue: number | undefined = undefined + export let maxValue: number | undefined = undefined export let formatter: ((value: string | number) => string | number) | undefined = undefined export let kind: EditStyle = 'editbox' export let autoFocus: boolean = false @@ -48,17 +50,27 @@ let phTranslate: string = '' $: { - if ( - format === 'number' && - maxDigitsAfterPoint && - value && - !value.toString().match(`^\\d+\\.?\\d{0,${maxDigitsAfterPoint}}$`) - ) { + if (format === 'number' && maxDigitsAfterPoint !== undefined && typeof value === 'number' && value) { value = floorFractionDigits(Number(value), maxDigitsAfterPoint) } else if (formatter !== undefined && value != null) { value = formatter(value) } } + + function setValue ( + val: number | string | undefined, + maxValue: number | undefined, + minValue: number | undefined + ): void { + if (typeof val !== 'number' || format !== 'number') return + if (minValue !== undefined && maxValue !== undefined && maxValue < minValue) return + if (minValue !== undefined && val < minValue) value = minValue + if (maxValue !== undefined && val > maxValue) value = maxValue + dispatch('change') + } + + $: setValue(value, maxValue, minValue) + $: translateCB(placeholder, placeholderParam ?? {}, $themeStore.language, (res) => { phTranslate = res }) diff --git a/packages/ui/src/components/HeaderButton.svelte b/packages/ui/src/components/HeaderButton.svelte new file mode 100644 index 0000000000..5c258e8ab5 --- /dev/null +++ b/packages/ui/src/components/HeaderButton.svelte @@ -0,0 +1,130 @@ + + + +{#if mainAction !== undefined} + {#if loading} + + {:else} +
+ {#if items.length === 1} + + {:else} + { + items.find((a) => a.id === ev.detail)?.callback() + }} + on:click={mainAction.callback} + mainButtonId={mainAction.id !== null ? String(mainAction.id).replaceAll(':', '-') : undefined} + showTooltipMain={{ + direction: 'bottom', + label: mainAction.label, + keys: mainAction.keyBinding + }} + > +
+ {#if mainAction.draft === true} +
+ {/if} +
+ + {/if} +
+ {/if} +{/if} + + diff --git a/packages/ui/src/components/Modal.svelte b/packages/ui/src/components/Modal.svelte index 4b422c5e72..80582e4c4d 100644 --- a/packages/ui/src/components/Modal.svelte +++ b/packages/ui/src/components/Modal.svelte @@ -23,6 +23,7 @@ export let type: 'type-aside' | 'type-popup' | 'type-component' export let width: 'large' | 'medium' | 'small' | 'x-small' | 'menu' | undefined = undefined + export let maxWidth: string | undefined = undefined export let label: IntlString | undefined = undefined export let labelProps: any | undefined = undefined export let okAction: () => Promise | void = () => {} @@ -69,7 +70,12 @@ -
+
maxValue) value = maxValue + dispatch('change') } + + $: setValue(value, maxValue, minValue) + $: style = `max-width: ${maxWidth || (parentWidth ? `${parentWidth}px` : 'max-content')};` $: translateCB(placeholder, placeholderParam ?? {}, $themeStore.language, (res) => { phTranslate = res @@ -152,8 +163,26 @@ on:blur />
-
@@ -166,6 +195,7 @@ padding: 0rem 0.125rem 0 0.5rem; border: 1px solid var(--theme-divider-color); border-radius: 0.375rem; + width: max-content; input { margin: 0; diff --git a/packages/ui/src/components/ShowMore.svelte b/packages/ui/src/components/ShowMore.svelte index 0dbce97a1b..b505e39e4d 100644 --- a/packages/ui/src/components/ShowMore.svelte +++ b/packages/ui/src/components/ShowMore.svelte @@ -21,9 +21,9 @@ export let limit: number = 240 export let ignore: boolean = false export let fixed: boolean = false + export let bigger: boolean = false let cHeight: number - let bigger: boolean = false let crop: boolean = false const toggle = (): void => { diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.ts index a0a4f1eb99..a20b1632c3 100644 --- a/packages/ui/src/index.ts +++ b/packages/ui/src/index.ts @@ -56,6 +56,7 @@ export { getCurrentLocation, locationToUrl, navigate, location, setLocationStora export { default as EditBox } from './components/EditBox.svelte' export { default as Label } from './components/Label.svelte' export { default as Button } from './components/Button.svelte' +export { default as HeaderButton } from './components/HeaderButton.svelte' export { default as ButtonWithDropdown } from './components/ButtonWithDropdown.svelte' export { default as ButtonGroup } from './components/ButtonGroup.svelte' export { default as FilterButton } from './components/FilterButton.svelte' diff --git a/packages/ui/src/types.ts b/packages/ui/src/types.ts index 0740e09b9a..b87e52f9cf 100644 --- a/packages/ui/src/types.ts +++ b/packages/ui/src/types.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -import type { Blob, Ref, Timestamp } from '@hcengineering/core' +import type { AccountRole, Blob, Permission, Ref, Timestamp, TypedSpace } from '@hcengineering/core' import type { Asset, IntlString, @@ -519,6 +519,21 @@ export interface SelectPopupValueType { } } +/** + * @public + */ +export interface HeaderButtonAction extends SelectPopupValueType { + callback: () => void + keyBindingPromise?: Promise + keyBinding?: string[] | undefined + draft?: boolean + accountRole?: AccountRole + permissions?: Array<{ + id: Ref + space: Ref + }> +} + /** * @public */ diff --git a/plugins/achievement-assets/lang/tr.json b/plugins/achievement-assets/lang/tr.json new file mode 100644 index 0000000000..3fbb442d0c --- /dev/null +++ b/plugins/achievement-assets/lang/tr.json @@ -0,0 +1,8 @@ +{ + "string": { + "Achievements": "Başarılar", + "EarliestAdopter": "İlk Kullanıcı", + "Epic": "Destansı", + "Legendary": "Efsanevi" + } +} diff --git a/plugins/activity-assets/lang/cs.json b/plugins/activity-assets/lang/cs.json index a2c296e2fe..19ef963a02 100644 --- a/plugins/activity-assets/lang/cs.json +++ b/plugins/activity-assets/lang/cs.json @@ -55,6 +55,7 @@ "RemovedObjectType": "Odstraněný {type} : {title}", "AttributeSetTo": "{name} nastaveno na {value}", "AddedTag": "Přidaný štítek: {title}", - "RemovedTag": "Odebráný štítek: {title}" + "RemovedTag": "Odebráný štítek: {title}", + "ValueTooLarge": "Hodnota je příliš velká na zobrazení" } } \ No newline at end of file diff --git a/plugins/activity-assets/lang/de.json b/plugins/activity-assets/lang/de.json index 440a7e237e..2bdd15ee70 100644 --- a/plugins/activity-assets/lang/de.json +++ b/plugins/activity-assets/lang/de.json @@ -55,6 +55,7 @@ "RemovedObjectType": "{objectType} entfernt", "AttributeSetTo": "{attribute} auf {value} gesetzt", "AddedTag": "Tag hinzugefügt: {title}", - "RemovedTag": "Tag entfernt: {title}" + "RemovedTag": "Tag entfernt: {title}", + "ValueTooLarge": "Wert zu groß zum Anzeigen" } } \ No newline at end of file diff --git a/plugins/activity-assets/lang/en.json b/plugins/activity-assets/lang/en.json index e3181c7cae..c64251c31d 100644 --- a/plugins/activity-assets/lang/en.json +++ b/plugins/activity-assets/lang/en.json @@ -55,6 +55,7 @@ "RemovedObjectType": "Removed {type} : {title}", "AddedTag": "Added tag: {title}", "RemovedTag": "Removed tag: {title}", - "AttributeSetTo": "{name} set to {value}" + "AttributeSetTo": "{name} set to {value}", + "ValueTooLarge": "Value too large to display" } } \ No newline at end of file diff --git a/plugins/activity-assets/lang/es.json b/plugins/activity-assets/lang/es.json index fddad7133b..0621d47cf1 100644 --- a/plugins/activity-assets/lang/es.json +++ b/plugins/activity-assets/lang/es.json @@ -54,6 +54,7 @@ "RemovedObjectType": "Eliminado {type} : {title}", "AttributeSetTo": "{name} establecido en {value}", "AddedTag": "Etiqueta añadida: {title}", - "RemovedTag": "Etiqueta eliminada: {title}" + "RemovedTag": "Etiqueta eliminada: {title}", + "ValueTooLarge": "Valor demasiado grande para mostrar" } } \ No newline at end of file diff --git a/plugins/activity-assets/lang/fr.json b/plugins/activity-assets/lang/fr.json index 176cb6e628..b3ade63865 100644 --- a/plugins/activity-assets/lang/fr.json +++ b/plugins/activity-assets/lang/fr.json @@ -55,6 +55,7 @@ "RemovedObjectType": "Supprimé {type} : {title}", "AttributeSetTo": "{name} défini sur {value}", "AddedTag": "Tag ajouté: {title}", - "RemovedTag": "Tag supprimé: {title}" + "RemovedTag": "Tag supprimé: {title}", + "ValueTooLarge": "Valeur trop grande pour être affichée" } } \ No newline at end of file diff --git a/plugins/activity-assets/lang/it.json b/plugins/activity-assets/lang/it.json index 1099d1e8b6..af41d8e7a0 100644 --- a/plugins/activity-assets/lang/it.json +++ b/plugins/activity-assets/lang/it.json @@ -55,6 +55,7 @@ "RemovedObjectType": "{type} rimosso: {title}", "AttributeSetTo": "{name} impostato su {value}", "AddedTag": "Tag aggiunto: {title}", - "RemovedTag": "Tag rimosso: {title}" + "RemovedTag": "Tag rimosso: {title}", + "ValueTooLarge": "Valore troppo grande per essere visualizzato" } } diff --git a/plugins/activity-assets/lang/ja.json b/plugins/activity-assets/lang/ja.json index 7947e1e220..f577714659 100644 --- a/plugins/activity-assets/lang/ja.json +++ b/plugins/activity-assets/lang/ja.json @@ -55,7 +55,8 @@ "RemovedObjectType": "{type} を削除：{title}", "AttributeSetTo": "{name} を {value} に設定しました", "AddedTag": "タグを追加しました：{title}", - "RemovedTag": "タグを削除しました：{title}" + "RemovedTag": "タグを削除しました：{title}", + "ValueTooLarge": "表示するには値が大きすぎます" } } \ No newline at end of file diff --git a/plugins/activity-assets/lang/pt.json b/plugins/activity-assets/lang/pt.json index cc37b6f2f0..7cd2d7e266 100644 --- a/plugins/activity-assets/lang/pt.json +++ b/plugins/activity-assets/lang/pt.json @@ -54,6 +54,7 @@ "RemovedObjectType": "Removido {type} : {title}", "AttributeSetTo": "{name} definido para {value}", "AddedTag": "Tag adicionado: {title}", - "RemovedTag": "Tag removido: {title}" + "RemovedTag": "Tag removido: {title}", + "ValueTooLarge": "Valor demasiado grande para mostrar" } } \ No newline at end of file diff --git a/plugins/activity-assets/lang/ru.json b/plugins/activity-assets/lang/ru.json index fe8d330f44..751df9a565 100644 --- a/plugins/activity-assets/lang/ru.json +++ b/plugins/activity-assets/lang/ru.json @@ -55,6 +55,7 @@ "RemovedObjectType": "Удален(ы) {type} : {title}", "AttributeSetTo": "{name} установлен на {value}", "AddedTag": "Добавлен тег: {title}", - "RemovedTag": "Удален тег: {title}" + "RemovedTag": "Удален тег: {title}", + "ValueTooLarge": "Значение слишком велико для отображения" } } \ No newline at end of file diff --git a/plugins/activity-assets/lang/tr.json b/plugins/activity-assets/lang/tr.json new file mode 100644 index 0000000000..43bf631f3f --- /dev/null +++ b/plugins/activity-assets/lang/tr.json @@ -0,0 +1,61 @@ +{ + "string": { + "Activity": "Aktivite", + "Added": "eklendi", + "All": "Tümü", + "AllActivity": "Tüm aktiviteler", + "Attributes": "Öznitelikler", + "Changed": "Değiştirildi", + "CollectionUpdated": "{collection} güncellendi", + "Created": "Oluşturuldu", + "DocAdded": "{_class} eklendi", + "DocCreated": "{_class} oluşturuldu", + "DocDeleted": "{_class} silindi", + "Edit": "Düzenle", + "Edited": "Düzenlendi", + "Emoji": "Emoji", + "For": "İçin", + "From": "kaynak", + "In": "İçinde", + "At": "de", + "LastReply": "Son yanıt", + "New": "Yeni", + "NewestFirst": "Önce en yeniler", + "Pinned": "Sabitlendi", + "Reacted": "Tepki verildi", + "Reactions": "Tepkiler", + "Reaction": "Tepki", + "Removed": "kaldırıldı", + "Replies": "Yanıtlar", + "RepliesCount": "{replies, plural, =1 {# yanıt} other {# yanıt}}", + "Set": "ayarlandı", + "To": "hedef", + "Unset": "Kaldırıldı", + "Update": "Güncelle", + "Updated": "Güncellendi", + "UpdatedCollection": "Güncellendi", + "Message": "Mesaj", + "Mentioned": "Bahsedildi", + "You": "Sen", + "Mentions": "Bahsetmeler", + "MentionedYouIn": "{title} içinde senden bahsetti", + "Messages": "Mesajlar", + "Thread": "Başlık", + "AddReaction": "Tepki ekle", + "SaveForLater": "Sonraya kaydet", + "RemoveFromLater": "Kayıtlılardan kaldır", + "ReactionNotificationTitle": "{title} üzerine tepki", + "ReactionNotificationBody": "{senderName}: {reaction}", + "NewObject": "Yeni {object}", + "RemovedObject": "Kaldırılan {object}", + "ChangedObject": "Değişen {object}", + "UnsetObject": "Kaldırılan {object}", + "UpdatedObject": "Güncellenen {object}", + "NewObjectType": "Yeni {type}: {title}", + "RemovedObjectType": "Kaldırılan {type}: {title}", + "AddedTag": "Etiket eklendi: {title}", + "RemovedTag": "Etiket kaldırıldı: {title}", + "AttributeSetTo": "{name}, {value} olarak ayarlandı", + "ValueTooLarge": "Değer görüntülenemeyecek kadar büyük" + } +} diff --git a/plugins/activity-assets/lang/zh.json b/plugins/activity-assets/lang/zh.json index e3f17a5322..7b2f012c54 100644 --- a/plugins/activity-assets/lang/zh.json +++ b/plugins/activity-assets/lang/zh.json @@ -55,6 +55,7 @@ "RemovedObjectType": "移除 {type} : {title}", "AttributeSetTo": "{name} 设置为 {value}", "AddedTag": "添加标签: {title}", - "RemovedTag": "移除标签: {title}" + "RemovedTag": "移除标签: {title}", + "ValueTooLarge": "值过大，无法显示" } } diff --git a/plugins/activity-resources/src/activity.ts b/plugins/activity-resources/src/activity.ts index 47cab72ebe..5cf6e364e1 100644 --- a/plugins/activity-resources/src/activity.ts +++ b/plugins/activity-resources/src/activity.ts @@ -19,6 +19,7 @@ import { writable } from 'svelte/store' export const savedMessagesStore = writable>>([]) export const messageInFocus = writable | undefined>(undefined) +export const editingMessageStore = writable | undefined>(undefined) const savedMessagesQuery = createQuery(true) diff --git a/plugins/activity-resources/src/components/Activity.svelte b/plugins/activity-resources/src/components/Activity.svelte index 8b0587d567..9ba9f3d299 100644 --- a/plugins/activity-resources/src/components/Activity.svelte +++ b/plugins/activity-resources/src/components/Activity.svelte @@ -20,7 +20,7 @@ DisplayActivityMessage, WithReferences } from '@hcengineering/activity' - import { Class, Doc, Ref, SortingOrder } from '@hcengineering/core' + import { Class, Doc, getCurrentAccount, Ref, SortingOrder } from '@hcengineering/core' import { createQuery, getClient } from '@hcengineering/presentation' import { Grid, Section, Spinner, location, Lazy } from '@hcengineering/ui' import { onDestroy, onMount } from 'svelte' @@ -30,7 +30,7 @@ import { combineActivityMessages, sortActivityMessages } from '../activityMessagesUtils' import { canGroupMessages, getMessageFromLoc, getSpace, getActivityNewestFirst } from '../utils' import ActivityMessagePresenter from './activity-message/ActivityMessagePresenter.svelte' - import { messageInFocus } from '../activity' + import { editingMessageStore, messageInFocus } from '../activity' export let object: WithReferences export let showCommenInput: boolean = true @@ -125,7 +125,7 @@ }, delay) } - async function scrollToMessage (id?: Ref): Promise { + async function scrollToMessage (id?: Ref, withoutAnimation?: boolean): Promise { if (!id || boundary == null || activityBox == null) { return } @@ -144,7 +144,9 @@ isAutoScroll = true prevScrollTimestamp = 0 - restartAnimation(msgElement) + if (!withoutAnimation) { + restartAnimation(msgElement) + } msgElement.scrollIntoView({ behavior: 'instant' }) } @@ -250,6 +252,41 @@ } $: void updateActivityMessages(object._id, isNewestFirst ? SortingOrder.Descending : SortingOrder.Ascending) + + export function editLastMessage (): void { + if (isMessagesLoading) return + + const me = getCurrentAccount() + const mySocialIds = new Set(me.socialIds) + + const start = isNewestFirst ? 0 : filteredMessages.length - 1 + const end = isNewestFirst ? filteredMessages.length : -1 + const step = isNewestFirst ? 1 : -1 + + let lastMessage: ActivityMessage | undefined + + for (let i = start; i !== end; i += step) { + const m = filteredMessages[i] + if (m.collection === 'comments' && m.createdBy != null && mySocialIds.has(m.createdBy)) { + lastMessage = m + break + } + } + + if (lastMessage == null) return + editingMessageStore.set(lastMessage._id) + + void scrollToMessage(lastMessage._id, true) + } + + function handleKeyDown (e: KeyboardEvent): void { + const key = e.key + + if ((key === 'ArrowUp' && !isNewestFirst) || (key === 'ArrowDown' && isNewestFirst)) { + if ($editingMessageStore !== undefined) return + editLastMessage() + } + }
@@ -275,7 +312,7 @@
{/if} @@ -319,7 +356,7 @@ {/if} diff --git a/plugins/activity-resources/src/components/ActivityFilter.svelte b/plugins/activity-resources/src/components/ActivityFilter.svelte index 3858f029e9..f9389f3a83 100644 --- a/plugins/activity-resources/src/components/ActivityFilter.svelte +++ b/plugins/activity-resources/src/components/ActivityFilter.svelte @@ -24,7 +24,7 @@ import activity from '../plugin' import FilterPopup from './FilterPopup.svelte' import IconClose from './icons/Close.svelte' - import { sortActivityMessages } from '../activityMessagesUtils' + import { activityMessagesComparator } from '../activityMessagesUtils' import { setActivityNewestFirst } from '../utils' export let messages: ActivityMessage[] @@ -91,9 +91,13 @@ selected: Ref[] | Ref, sortOrder: SortingOrder ): Promise { - const sortedMessages = sortActivityMessages(messages, sortOrder).sort(({ isPinned }) => - isPinned && sortOrder === SortingOrder.Ascending ? -1 : 1 - ) + const baseComparator = (m1: ActivityMessage, m2: ActivityMessage): number => + sortOrder === SortingOrder.Ascending ? activityMessagesComparator(m1, m2) : activityMessagesComparator(m2, m1) + const sortedMessages = messages.sort((message1, message2) => { + const isPinned1 = message1.isPinned ?? false + const isPinned2 = message2.isPinned ?? false + return isPinned1 === isPinned2 ? baseComparator(message1, message2) : Number(isPinned2) - Number(isPinned1) + }) if (selected === allId) { filtered = sortedMessages diff --git a/plugins/activity-resources/src/components/doc-update-message/attributes/SetAttributesPresenter.svelte b/plugins/activity-resources/src/components/doc-update-message/attributes/SetAttributesPresenter.svelte index 222ec50551..5dc87f8c75 100644 --- a/plugins/activity-resources/src/components/doc-update-message/attributes/SetAttributesPresenter.svelte +++ b/plugins/activity-resources/src/components/doc-update-message/attributes/SetAttributesPresenter.svelte @@ -33,6 +33,8 @@ $: isUnset = values.length > 0 && !values.some((value) => value != null && value !== '') $: isTextType = getIsTextType(attributeModel) + $: isTooLarge = + isTextType && (values[0] === activity.string.ValueTooLarge || prevValue === activity.string.ValueTooLarge) let isDiffShown = false @@ -48,7 +50,11 @@ {:else if isTextType} - {#if preview} + {#if isTooLarge} +
+
+ {:else if preview}
diff --git a/plugins/chat-resources/src/location.ts b/plugins/chat-resources/src/location.ts index 06e8bd44c8..1dd655b6b4 100644 --- a/plugins/chat-resources/src/location.ts +++ b/plugins/chat-resources/src/location.ts @@ -142,7 +142,11 @@ export async function resolveLocationData (loc: Location): Promise return {} } - return { name: object.title } + return { + name: object.title, + objectId: object._id, + objectClass: object._class + } } if (typeId !== undefined) { diff --git a/plugins/chunter-assets/lang/tr.json b/plugins/chunter-assets/lang/tr.json new file mode 100644 index 0000000000..358ad9f13c --- /dev/null +++ b/plugins/chunter-assets/lang/tr.json @@ -0,0 +1,138 @@ +{ + "string": { + "ApplicationLabelChunter": "Sohbet", + "LeftComment": "yorum bıraktı", + "Channels": "Kanallar", + "DirectMessages": "Direkt mesajlar", + "CreateChannel": "Yeni Kanal", + "NewDirectMessage": "Yeni Direkt Mesaj", + "ChannelName": "İsim", + "ChannelNamePlaceholder": "Kanal", + "ChannelDescription": "Açıklama", + "Channel": "Kanal", + "DirectMessage": "Direkt mesaj", + "EditUpdate": "Kaydet...", + "EditCancel": "İptal", + "Comments": "Yorumlar", + "About": "Hakkında", + "Members": "Üyeler", + "NoMembers": "Üye yok", + "MentionedIn": "Senden bahsetti: ", + "Mentioned": "Bahsedildi", + "ContactInfo": "İletişim Bilgisi", + "Content": "İçerik", + "Comment": "Yorum", + "Message": "Mesaj", + "MessageOn": "Mesaj tarihi", + "On": "tarihinde", + "Reference": "Referans", + "Chat": "Sohbet", + "In": "İçinde", + "MentionNotification": "Bahsedildi", + "Topic": "Konu", + "Thread": "Başlık", + "Threads": "Başlıklar", + "New": "Yeni", + "MarkUnread": "Okunmadı olarak işaretle", + "GetNewReplies": "Yeni yanıtlardan haberdar ol", + "TurnOffReplies": "Yanıt bildirimlerini kapat", + "PinMessage": "Mesajı sabitle", + "UnpinMessage": "Sabitleneni kaldır", + "Pinned": "Sabitlendi", + "EditMessage": "Mesajı düzenle", + "Edited": "düzenlendi", + "DeleteMessage": "Mesajı sil", + "AndYou": "{participants, plural, =0 {Sadece sen} other {ve sen}}", + "ShowMoreReplies": "{count} yanıt daha göster", + "Settings": "Ayarlar", + "ArchiveChannel": "Kanalı arşivle", + "UnarchiveChannel": "Arşivden çıkar", + "ArchiveConfirm": "Bir kanalı arşivlediğinizde, herkes için arşivlenir.

Kimse mesaj gönderemez, ancak kanalın geçmişine erişim devam eder.

Kanalın içeriğini arama yoluyla bulabilirsiniz.
Ve gerekirse gelecekte kanalı arşivden çıkarabilirsiniz.\n", + "UnarchiveConfirm": "Kanalı arşivden çıkarmak istiyor musunuz?", + "AddToSaved": "Kayıtlılara ekle", + "RemoveFromSaved": "Kayıtlılardan kaldır", + "EmptySavedHeader": "Daha sonra dönmek için mesajlar ekleyin", + "EmptySavedText": "Yapılacaklarınızı işaretleyin veya bir şeyi başka bir zamana kaydedin. Kayıtlı öğelerinizi sadece siz görebilirsiniz, bu yüzden istediğiniz gibi kullanın.", + "SharedBy": "{name} tarafından {time} paylaşıldı", + "LeaveChannel": "Kanaldan ayrıl", + "ChannelBrowser": "Kanal tarayıcı", + "Saved": "Kayıtlı", + "ConvertToPrivate": "Özel kanala dönüştür", + "MessagesBrowser": "Mesaj tarayıcı", + "CreateBy": "Oluşturan", + "ThreadMessage": "Başlık mesajı", + "ChunterBrowser": "Tarayıcı", + "Messages": "Mesajlar", + "NoResults": "Sonuç yok", + "CopyLink": "Bağlantıyı kopyala", + "FilterBacklinks": "Geri bağlantılar", + "DM": "Direkt mesaj", + "DMNotification": "Size mesaj gönderdi", + "ConfigLabel": "Sohbet", + "ConfigDescription": "Metin iletişimi gerçekleştirmek için uzantı", + "LastMessage": "Son mesaj", + "You": "Sen", + "YouHaveJoinedTheConversation": "Sohbete katıldınız", + "NoMessages": "Henüz mesaj yok", + "DirectNotificationTitle": "{senderName}", + "DirectNotificationBody": "{message}", + "MessageNotificationBody": "{senderName}: {message}", + "AddCommentPlaceholder": "Yorum ekle...", + "Reacted": "Tepki verildi", + "Docs": "Dokümanlar", + "NewestFirst": "Önce en yeniler", + "ReplyToThread": "Başlığa yanıt ver", + "SentMessage": "Mesaj gönderildi", + "Direct": "Direkt", + "RepliedToThread": "Başlığa yanıt verildi", + "RepliedTo": "yanıtlandı: {message}", + "AllChannels": "Tüm kanallar", + "AllContacts": "Tüm kişiler", + "NewChannel": "Yeni kanal", + "TopicOptional": "Konu (opsiyonel)", + "Visibility": "Görünürlük", + "Public": "Genel", + "Private": "Özel", + "NewDirectChat": "Yeni direkt sohbet", + "AddMembers": "Üye ekle", + "PinnedCount": "{count} sabitlendi", + "LoadingHistory": "Geçmiş yükleniyor...", + "UnpinChannels": "Tüm kanalların sabitlemesini kaldır", + "ArchiveActivityConfirmationTitle": "Tüm aktivite kanallarını arşivle?", + "ArchiveActivityConfirmationMessage": "Tüm aktivite kanallarını arşivlemek istediğinizden emin misiniz? Bu işlem geri alınamaz.", + "CloseConversation": "Sohbeti kapat", + "Starred": "Yıldızlı", + "DeleteStarred": "Yıldızlıyı sil", + "StarChannel": "Kanalı yıldızla", + "StarConversation": "Sohbeti yıldızla", + "UnstarChannel": "Kanal yıldızını kaldır", + "UnstarConversation": "Sohbet yıldızını kaldır", + "JoinChannelHeader": "Başlamak için \"Katıl\"a tıklayın.", + "JoinChannelText": "Katıldıktan sonra tüm mesajları okuyabilir ve tartışmaya katkıda bulunabilirsiniz.", + "NoMessagesInChannel": "Şu anda mesaj yok", + "SendMessagesInChannel": "Sohbeti başlatmak için ilk mesajı gönderin", + "LatestMessages": "↓ Son mesajlar", + "Joined": "Katıldı", + "Left": "Ayrıldı", + "Added": "Eklendi", + "Removed": "Kaldırıldı", + "CreatedChannelOn": "Bu kanal {date} tarihinde oluşturuldu", + "ChannelMessages": "Kanal mesajları", + "JoinChannel": "Kanala katıl", + "YouJoinedChannel": "Kanala katıldınız", + "AndMore": "ve {count} daha", + "IsTyping": "{count, plural, =1 {yazıyor} other {yazıyorlar}}...", + "ThreadIn": "{name} içinde başlık", + "TranslateMessage": "Mesajı çevir", + "Translate": "Çevir", + "ShowOriginal": "Orijinali göster", + "Translating": "Çevriliyor...", + "StartConversation": "Sohbet başlat", + "ViewingThreadFromArchivedChannel": "Arşivlenmiş bir kanaldan başlık görüntülüyorsunuz", + "ViewingArchivedChannel": "Arşivlenmiş bir kanal görüntülüyorsunuz", + "OpenChatInSidebar": "Sohbeti kenar çubuğunda aç", + "ResolveThread": "Çöz", + "NoThreadsYet": "Henüz başlık yok.", + "SummarizeMessages": "Tartışmayı özetle" + } +} diff --git a/plugins/chunter-resources/src/components/ChannelInput.svelte b/plugins/chunter-resources/src/components/ChannelInput.svelte index ccc9c02594..d8823b7545 100644 --- a/plugins/chunter-resources/src/components/ChannelInput.svelte +++ b/plugins/chunter-resources/src/components/ChannelInput.svelte @@ -30,6 +30,7 @@ export let collection: string | undefined export let isThread = false export let autofocus = true + export let onKeyDown: ((e: KeyboardEvent) => void) | undefined = undefined const client = getClient() const hierarchy = client.getHierarchy() @@ -86,7 +87,7 @@ {:else} diff --git a/plugins/chunter-resources/src/components/ChannelTypingInfo.svelte b/plugins/chunter-resources/src/components/ChannelTypingInfo.svelte index ec0064ed1b..bb48155ef1 100644 --- a/plugins/chunter-resources/src/components/ChannelTypingInfo.svelte +++ b/plugins/chunter-resources/src/components/ChannelTypingInfo.svelte @@ -13,13 +13,12 @@ // limitations under the License. --> - + {#if typingPersonsLabel !== ''} {typingPersonsLabel} diff --git a/plugins/chunter-resources/src/components/DirectMessageButton.svelte b/plugins/chunter-resources/src/components/DirectMessageButton.svelte index e0cfbff3df..dc10f34e69 100644 --- a/plugins/chunter-resources/src/components/DirectMessageButton.svelte +++ b/plugins/chunter-resources/src/components/DirectMessageButton.svelte @@ -44,12 +44,22 @@ } - +
+ +
+ + diff --git a/plugins/chunter-resources/src/components/ReverseChannelScrollView.svelte b/plugins/chunter-resources/src/components/ReverseChannelScrollView.svelte index f8f0eddd83..a9f1076d63 100644 --- a/plugins/chunter-resources/src/components/ReverseChannelScrollView.svelte +++ b/plugins/chunter-resources/src/components/ReverseChannelScrollView.svelte @@ -14,17 +14,23 @@ -->
@@ -641,7 +681,15 @@ {/if} {#if !fixedInput && withInput && !readonly} - + {/if} {#if !isThread && isLatestMessageButtonVisible} @@ -658,7 +706,15 @@
{#if fixedInput && withInput && !readonly} - + {/if} {#if readonly} diff --git a/plugins/chunter-resources/src/components/chat-message/ChatMessageInput.svelte b/plugins/chunter-resources/src/components/chat-message/ChatMessageInput.svelte index 6245426a01..de11b4982f 100644 --- a/plugins/chunter-resources/src/components/chat-message/ChatMessageInput.svelte +++ b/plugins/chunter-resources/src/components/chat-message/ChatMessageInput.svelte @@ -23,8 +23,9 @@ import { createEventDispatcher } from 'svelte' import { getObjectId } from '@hcengineering/view-resources' import { ThrottledCaller } from '@hcengineering/ui' - import { getSpace } from '@hcengineering/activity-resources' + import { getSpace, editingMessageStore } from '@hcengineering/activity-resources' import { getCurrentEmployee } from '@hcengineering/contact' + import { getChannelSpace } from '../../utils' import ChannelTypingInfo from '../ChannelTypingInfo.svelte' @@ -37,6 +38,7 @@ export let collection: string = 'comments' export let autofocus = false export let withTypingInfo = false + export let onKeyDown: ((e: KeyboardEvent) => void) | undefined = undefined import { setTyping, clearTyping } from '@hcengineering/presence-resources' @@ -102,14 +104,14 @@ async function deleteTypingInfo (): Promise { if (!withTypingInfo) return - clearTyping(me, object._id) + void clearTyping(me, object._id) } async function updateTypingInfo (): Promise { if (!withTypingInfo) return throttle.call(() => { - setTyping(me, object._id) + void setTyping(me, object._id) }) } @@ -216,6 +218,22 @@ export function submit (): void { inputRef.submit() } + + function handleKeyDown (event: KeyboardEvent): boolean { + if (event.key === 'ArrowUp' || event.key === 'ArrowDown') { + if (inputRef.isEmptyDraft() && chatMessage == null) { + onKeyDown?.(event) + } + } + + if (event.key === 'Escape') { + if ($editingMessageStore === undefined) return false + event.stopPropagation() + event.preventDefault() + editingMessageStore.set(undefined) + } + return false + } {#if withTypingInfo} diff --git a/plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte b/plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte index 7f9c9e9b9c..b6615b3127 100644 --- a/plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte +++ b/plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte @@ -14,7 +14,12 @@ --> {#if window !== undefined && window.hasPrevPage()} diff --git a/plugins/communication-resources/src/components/ReactionPresenter.svelte b/plugins/communication-resources/src/components/ReactionPresenter.svelte index 899a321547..22b3c99d79 100644 --- a/plugins/communication-resources/src/components/ReactionPresenter.svelte +++ b/plugins/communication-resources/src/components/ReactionPresenter.svelte @@ -13,7 +13,7 @@ @@ -34,7 +34,7 @@ class:selected class:active on:click - use:tooltip={(count ?? 0) > 0 ? { component: ReactionsTooltip, props: { socialIds } } : undefined} + use:tooltip={(count ?? 0) > 0 ? { component: ReactionsTooltip, props: { persons, emoji } } : undefined} >
{#if icon} @@ -43,7 +43,7 @@ {/if}
- {#if count !== undefined} + {#if count !== undefined && count > 0}
{count}
{/if} diff --git a/plugins/communication-resources/src/components/ReactionsList.svelte b/plugins/communication-resources/src/components/ReactionsList.svelte index 6a4f444d9b..da5da03a9b 100644 --- a/plugins/communication-resources/src/components/ReactionsList.svelte +++ b/plugins/communication-resources/src/components/ReactionsList.svelte @@ -14,13 +14,13 @@
- {#each reactionsByEmoji as [emoji, reactions] (emoji)} - me.socialIds.includes(it.creator))} - socialIds={reactions.map((it) => it.creator)} - count={reactions.length} - on:click={() => dispatch('click', emoji)} - /> + {#each Object.entries(reactions) as [emoji, data] (emoji)} + {#if data.length > 0} + it.person === me.uuid)} + persons={data.map((it) => it.person)} + count={data.length} + on:click={() => dispatch('click', emoji)} + /> + {/if} {/each}
diff --git a/plugins/communication-resources/src/components/ReactionsTooltip.svelte b/plugins/communication-resources/src/components/ReactionsTooltip.svelte index 1485a651dc..88c3ec3cd8 100644 --- a/plugins/communication-resources/src/components/ReactionsTooltip.svelte +++ b/plugins/communication-resources/src/components/ReactionsTooltip.svelte @@ -12,21 +12,53 @@
- {#each persons as person (person)} - +
+ + {#if shortCode} + + :{shortCode}: + + {/if} +
+ {#each employees as emp (emp._id)} + {/each}
+ + diff --git a/plugins/communication-resources/src/components/TextInput.svelte b/plugins/communication-resources/src/components/TextInput.svelte index a5d4c3209f..eb1feec2a7 100644 --- a/plugins/communication-resources/src/components/TextInput.svelte +++ b/plugins/communication-resources/src/components/TextInput.svelte @@ -37,6 +37,7 @@ export let autofocus: FocusPosition = false export let onCancel: (() => void) | undefined = undefined export let onPaste: ((view: EditorView, event: ClipboardEvent) => boolean) | undefined = undefined + export let onKeyDown: ((view: EditorView, event: KeyboardEvent) => boolean) | undefined = undefined const dispatch = createEventDispatcher() @@ -140,6 +141,7 @@ {placeholder} {placeholderParams} {onPaste} + {onKeyDown} on:content={(ev) => { if (canSubmit(loading, content, hasChanges)) { dispatch('submit', ev.detail) diff --git a/plugins/communication-resources/src/components/TypingPresenter.svelte b/plugins/communication-resources/src/components/TypingPresenter.svelte index cbf8f74c49..8a804078ef 100644 --- a/plugins/communication-resources/src/components/TypingPresenter.svelte +++ b/plugins/communication-resources/src/components/TypingPresenter.svelte @@ -11,13 +11,12 @@ - + {#if typingPersonsLabel !== ''} {typingPersonsLabel} diff --git a/plugins/communication-resources/src/components/message/MessageBody.svelte b/plugins/communication-resources/src/components/message/MessageBody.svelte index ed2efde337..33f686c1ff 100644 --- a/plugins/communication-resources/src/components/message/MessageBody.svelte +++ b/plugins/communication-resources/src/components/message/MessageBody.svelte @@ -18,7 +18,7 @@ import { formatName, Person } from '@hcengineering/contact' import { Message } from '@hcengineering/communication-types' import { Card } from '@hcengineering/card' - import { IconDelete, Label } from '@hcengineering/ui' + import { Label } from '@hcengineering/ui' import communication from '../../plugin' import MessageInput from './MessageInput.svelte' @@ -34,7 +34,11 @@ export let compact: boolean = false export let hideAvatar: boolean = false export let hideHeader: boolean = false - export let thread: boolean = true + export let showThreads: boolean = true + export let collapsible: boolean = true + export let maxHeight: string = '30rem' + + let isShowMoreActive: boolean = false function formatDate (date: Date): string { return date.toLocaleTimeString('default', { @@ -58,8 +62,8 @@
{#if !isEditing && message.content !== ''} -
- +
+
{:else if isEditing} {/if} {#if !isEditing} - + {/if}
@@ -82,46 +86,40 @@
{#if !hideAvatar}
- {#if !message.removed} - - - - {:else} - - {/if} + + +
{/if}
- {#if !message.removed} - -
- {formatName(author?.name ?? '')} -
- - {/if} + +
+ {formatName(author?.name ?? '')} +
+
{formatDate(message.created)}
- {#if message.edited && !message.removed} + {#if message.modified}
(
{/if} - {#if !message.removed && $translateMessagesStore.get(message.id)?.inProgress === true} + {#if $translateMessagesStore.get(message.id)?.inProgress === true}
{/if} - {#if !message.removed && $translateMessagesStore.get(message.id)?.shown === true} + {#if $translateMessagesStore.get(message.id)?.shown === true}
showOriginalMessage(message, card)}>
{/if}
{#if !isEditing} -
- +
+
{:else if isEditing} {/if} {#if !isEditing} - + {/if}
@@ -225,6 +223,11 @@ max-width: 100%; user-select: text; flex: 1; + + &.with-showmore { + position: relative; // This ensures ShowMore button positions relative to this container + margin-bottom: 1rem; + } } .time-container { diff --git a/plugins/communication-resources/src/components/message/MessageContentViewer.svelte b/plugins/communication-resources/src/components/message/MessageContentViewer.svelte index ce287aa779..97fffa5687 100644 --- a/plugins/communication-resources/src/components/message/MessageContentViewer.svelte +++ b/plugins/communication-resources/src/components/message/MessageContentViewer.svelte @@ -17,20 +17,22 @@ import { MessageViewer as MarkupMessageViewer } from '@hcengineering/presentation' import { Markdown, Message, MessageID } from '@hcengineering/communication-types' import { Card } from '@hcengineering/card' - import { Label } from '@hcengineering/ui' import { Person } from '@hcengineering/contact' import { Markup } from '@hcengineering/core' + import { ShowMore } from '@hcengineering/ui' import ActivityMessageViewer from './ActivityMessageViewer.svelte' import { toMarkup } from '../../utils' import { isActivityMessage } from '../../activity' - import communication from '../../plugin' import { isShownTranslatedMessage, TranslateMessagesStatus, translateMessagesStore } from '../../stores' import { translateMessage } from '../../actions' export let card: Card export let message: Message export let author: Person | undefined + export let collapsible: boolean = true + export let maxHeight: string = '30rem' + export let isShowMoreActive: boolean = false let displayMarkup: Markup = toMarkup(message.content) let prevContent: Markdown | undefined = undefined @@ -57,20 +59,20 @@ }) } } + + function getMaxSize (maxHeight: string): number { + const remValue = parseFloat(maxHeight.replace('rem', '')) + if (isNaN(remValue) || remValue <= 0) { + return 480 // 30rem * 16px + } + return remValue * 16 + } -{#if isActivityMessage(message)} - -{:else if message.removed} - - -{:else} - -{/if} - - + + {#if isActivityMessage(message)} + + {:else} + + {/if} + diff --git a/plugins/communication-resources/src/components/message/MessageFooter.svelte b/plugins/communication-resources/src/components/message/MessageFooter.svelte index 734a35b957..1f1714454c 100644 --- a/plugins/communication-resources/src/components/message/MessageFooter.svelte +++ b/plugins/communication-resources/src/components/message/MessageFooter.svelte @@ -15,10 +15,10 @@ -{#if applets.length > 0 && !message.removed} +{#if applets.length > 0}
{#each applets as applet (applet.id)} - {@const appletModel = appletsModels.find((it) => it.type === applet.type)} + {@const appletModel = appletsModels.find((it) => it.type === applet.mimeType)} {#if appletModel} {/if} -{#if blobs.length > 0 && !message.removed} +{#if blobs.length > 0}
{#each blobs as blob (blob.id)} {/if} -{#if links.length > 0 && !message.removed} +{#if links.length > 0}
{#each links as link (link.id)} {/if} -{#if message.reactions.length > 0 && !message.removed} +{#if Object.keys(message.reactions).length > 0}
{/if} -{#if thread && message.thread && message.thread.threadId} + +{#if showThreads && message.threads.length > 0}
- + {#each message.threads as thread (thread.threadId)} + + {/each}
{/if} @@ -147,9 +152,10 @@ margin-left: -0.5rem; padding-bottom: 0; display: flex; - align-items: flex-start; - align-self: stretch; + flex-direction: column; + gap: 0.5rem; overflow: hidden; + width: 100%; } .message__files { diff --git a/plugins/communication-resources/src/components/message/MessageInput.svelte b/plugins/communication-resources/src/components/message/MessageInput.svelte index 27a45f8149..f192289908 100644 --- a/plugins/communication-resources/src/components/message/MessageInput.svelte +++ b/plugins/communication-resources/src/components/message/MessageInput.svelte @@ -58,6 +58,7 @@ import { type TextInputAction, MessageDraft, AppletDraft } from '../../types' import TypingPresenter from '../TypingPresenter.svelte' import { getDraft, messageToDraft, saveDraft, getEmptyDraft, removeDraft } from '../../draft' + import { messageEditingStore } from '../../stores' export let card: Card export let message: Message | undefined = undefined @@ -139,7 +140,7 @@ await editMessage(message, markdown, blobsToLoad, linksToLoad, appletsToLoad) } - clearTyping(me, card._id) + void clearTyping(me, card._id) } async function attachApplets (messageId: MessageID, appletDrafts: AppletDraft[]): Promise { @@ -163,7 +164,7 @@ if (toAttach.length > 0) { void communicationClient.attachmentPatch(card._id, messageId, { add: toAttach.map((it) => ({ - type: it.type, + mimeType: it.mimeType, params: it.params })) }) @@ -172,7 +173,7 @@ async function createMessage ( markdown: string, - blobs: BlobParams[], + blobs: (BlobParams & { mimeType: string })[], links: LinkPreviewParams[], urlsToLoad: string[], appletDrafts: AppletDraft[] @@ -186,7 +187,7 @@ void communicationClient.attachmentPatch(card._id, messageId, { add: blobs.map((it) => ({ id: it.blobId as any as AttachmentID, - type: it.mimeType, + mimeType: it.mimeType, params: it })) }) @@ -195,7 +196,7 @@ if (links.length > 0) { void communicationClient.attachmentPatch(card._id, messageId, { add: links.map((it) => ({ - type: linkPreviewType, + mimeType: linkPreviewType, params: it })) }) @@ -210,7 +211,7 @@ void communicationClient.attachmentPatch(card._id, messageId, { add: [ { - type: linkPreviewType, + mimeType: linkPreviewType, params } ] @@ -221,7 +222,7 @@ async function editMessage ( message: Message, markdown: string, - blobs: BlobParams[], + blobs: (BlobParams & { mimeType: string })[], links: LinkPreviewParams[], appletDrafts: AppletDraft[] ): Promise { @@ -240,7 +241,7 @@ void communicationClient.attachmentPatch(card._id, message.id, { add: attachBlobs.map((it) => ({ id: it.blobId as any as AttachmentID, - type: it.mimeType, + mimeType: it.mimeType, params: it })) }) @@ -274,7 +275,7 @@ void communicationClient.attachmentPatch(card._id, message.id, { add: attachLinks.map((it) => ({ - type: linkPreviewType, + mimeType: linkPreviewType, params: it })) }) @@ -495,7 +496,10 @@ if (result != null) { draft = { ...draft, - applets: [...draft.applets, { id: generateId(), type: applet.type, appletId: applet._id, params: result }] + applets: [ + ...draft.applets, + { id: generateId(), mimeType: applet.type, appletId: applet._id, params: result } + ] } } }) @@ -548,6 +552,20 @@ void uploadWith(handler) } })) + + function handleKeyDown (_: any, event: KeyboardEvent): boolean { + if (event.key === 'ArrowUp') { + if (isEmptyDraft() && $messageEditingStore === undefined) { + dispatch('arrowUp') + } + } + if (event.key === 'Escape') { + if ($messageEditingStore !== undefined) { + messageEditingStore.set(undefined) + } + } + return false + } @@ -578,8 +596,10 @@ actions={[...defaultMessageInputActions, attachAction, ...uploadActions, ...appletActions]} on:submit={handleSubmit} on:update={onUpdate} + autofocus="end" onCancel={onCancel ? handleCancel : undefined} onPaste={pasteAction} + onKeyDown={handleKeyDown} >
{#if draft.blobs.length > 0 || draft.links.length > 0 || draft.applets.length > 0} diff --git a/plugins/communication-resources/src/components/message/MessagePresenter.svelte b/plugins/communication-resources/src/components/message/MessagePresenter.svelte index d9f2aac52a..da828d96a6 100644 --- a/plugins/communication-resources/src/components/message/MessagePresenter.svelte +++ b/plugins/communication-resources/src/components/message/MessagePresenter.svelte @@ -43,13 +43,13 @@ export let hideAvatar: boolean = false export let hideHeader: boolean = false export let readonly: boolean = false - export let thread: boolean = true + export let showThreads: boolean = true + export let collapsible: boolean = true + export let maxHeight: string = '30rem' let isEditing = false - let isDeleted = false let author: Person | undefined - $: isDeleted = message.removed $: isEditing = $messageEditingStore === message.id $: void updateAuthor(message.creator) @@ -138,8 +138,7 @@ let isActionsPanelOpened = false - $: showActions = !isEditing && !isDeleted && !readonly - $: isThread = message.thread != null + $: showActions = !isEditing && !readonly @@ -152,7 +151,7 @@ class:noHover={readonly} style:padding > - {#if message.type === MessageType.Activity || (message.removed && message.thread?.threadId === undefined)} + {#if message.type === MessageType.Activity} {:else} {/if} diff --git a/plugins/communication-resources/src/components/message/MessagesGroupPresenter.svelte b/plugins/communication-resources/src/components/message/MessagesGroupPresenter.svelte index 3b8334590b..860beb705f 100644 --- a/plugins/communication-resources/src/components/message/MessagesGroupPresenter.svelte +++ b/plugins/communication-resources/src/components/message/MessagesGroupPresenter.svelte @@ -51,8 +51,6 @@ {#each messages as message, index (message.id)} {@const previousMessage = messages[index - 1]} {@const compact = - !message.removed && - !previousMessage?.removed && previousMessage !== undefined && previousMessage.creator === message.creator && previousMessage.type === message.type && diff --git a/plugins/communication-resources/src/components/message/OneRowMessageBody.svelte b/plugins/communication-resources/src/components/message/OneRowMessageBody.svelte index 709d839072..1c0b0825ee 100644 --- a/plugins/communication-resources/src/components/message/OneRowMessageBody.svelte +++ b/plugins/communication-resources/src/components/message/OneRowMessageBody.svelte @@ -18,7 +18,6 @@ import { formatName, Person } from '@hcengineering/contact' import { Message } from '@hcengineering/communication-types' import { Card } from '@hcengineering/card' - import { IconDelete } from '@hcengineering/ui' import MessageContentViewer from './MessageContentViewer.svelte' import MessageFooter from './MessageFooter.svelte' @@ -35,24 +34,17 @@ minute: 'numeric' }) } - - let isDeleted = false - $: isDeleted = message.removed
{#if !hideAvatar}
- {#if !isDeleted} - - - - {:else} - - {/if} + + +
{/if} - {#if !isDeleted && !hideHeader} + {#if !hideHeader}
@@ -69,11 +61,9 @@
-{#if !isDeleted} -
- -
-{/if} +
+ +
diff --git a/plugins/communication-resources/src/components/message/activity/ActivityUpdateViewer.svelte b/plugins/communication-resources/src/components/message/activity/ActivityUpdateViewer.svelte index e322725c21..e9a31392de 100644 --- a/plugins/communication-resources/src/components/message/activity/ActivityUpdateViewer.svelte +++ b/plugins/communication-resources/src/components/message/activity/ActivityUpdateViewer.svelte @@ -22,6 +22,7 @@ import { Person } from '@hcengineering/contact' import { Card } from '@hcengineering/card' import ActivityUpdateTypeViewer from './ActivityUpdateTypeViewer.svelte' + import ActivityUpdateProcessViewer from './ActivityUpdateProcessViewer.svelte' export let model: AttributeModel | undefined = undefined export let update: ActivityUpdate @@ -38,4 +39,6 @@ {:else if update.type === ActivityUpdateType.Type} +{:else if update.type === ActivityUpdateType.Process} + {/if} diff --git a/plugins/communication-resources/src/components/thread/Thread.svelte b/plugins/communication-resources/src/components/thread/Thread.svelte index 451ad88890..e0079a332e 100644 --- a/plugins/communication-resources/src/components/thread/Thread.svelte +++ b/plugins/communication-resources/src/components/thread/Thread.svelte @@ -17,6 +17,7 @@ import { createQuery } from '@hcengineering/presentation' import { Thread } from '@hcengineering/communication-types' import cardPlugin, { Card } from '@hcengineering/card' + import { createEventDispatcher } from 'svelte' import ThreadCollaborators from './ThreadCollaborators.svelte' import ThreadRepliesCount from './ThreadRepliesCount.svelte' @@ -25,6 +26,8 @@ import ThreadTitle from './ThreadTitle.svelte' export let thread: Thread + + const dispatch = createEventDispatcher() const threadCardQuery = createQuery() let threadCard: Card | undefined @@ -52,13 +55,13 @@
-
- +
dispatch('click', threadCard?._id)} style:max-width={`${clientWidth}px`}> + {#if thread.repliesCount > 0} - + {/if} diff --git a/plugins/communication-resources/src/components/thread/ThreadCollaborators.svelte b/plugins/communication-resources/src/components/thread/ThreadCollaborators.svelte index 41adce0c85..fc97da7cb1 100644 --- a/plugins/communication-resources/src/components/thread/ThreadCollaborators.svelte +++ b/plugins/communication-resources/src/components/thread/ThreadCollaborators.svelte @@ -12,32 +12,23 @@ -{#if persons.length > 0} +{#if _persons.length > 0}
- {#each persons as person} + {#each _persons as person} {/each}
- {#if collaborators.length > displayPersonsNumber} - +{collaborators.length - displayPersonsNumber} + {#if count > displayPersonsNumber} + +{count - displayPersonsNumber} {/if} {/if} diff --git a/plugins/communication-resources/src/draft.ts b/plugins/communication-resources/src/draft.ts index 9258ad85ff..0caa29aa45 100644 --- a/plugins/communication-resources/src/draft.ts +++ b/plugins/communication-resources/src/draft.ts @@ -99,14 +99,14 @@ export function messageToDraft (message: Message): MessageDraft { return { _id: message.id, content: toMarkup(message.content), - blobs: message.attachments.filter(isBlobAttachment).map((it) => it.params), + blobs: message.attachments.filter(isBlobAttachment).map((it) => ({ ...it.params, mimeType: it.mimeType })), links: message.attachments.filter(isLinkPreviewAttachment).map((it) => it.params), applets: message.attachments .filter(isAppletAttachment) .map((it) => ({ id: it.id, - type: it.type, - appletId: applets.find((a) => a.type === it.type)?._id as any, + mimeType: it.mimeType, + appletId: applets.find((a) => a.type === it.mimeType)?._id as any, params: it.params })) .filter((it) => it.appletId !== undefined) diff --git a/plugins/communication-resources/src/stores.ts b/plugins/communication-resources/src/stores.ts index e794ce3d1d..dbd88a2fc4 100644 --- a/plugins/communication-resources/src/stores.ts +++ b/plugins/communication-resources/src/stores.ts @@ -13,12 +13,11 @@ import { get, writable } from 'svelte/store' import { createLabelsQuery, createQuery, onClient, onCommunicationClient } from '@hcengineering/presentation' -import type { Label, Message, MessageID } from '@hcengineering/communication-types' -import type { Markup, Ref } from '@hcengineering/core' +import { type Label, type LabelID, type Message, type MessageID } from '@hcengineering/communication-types' +import core, { getCurrentAccount, type Markup, type Ref } from '@hcengineering/core' import { languageStore } from '@hcengineering/ui' -import { type Card } from '@hcengineering/card' +import cardPlugin, { type Card } from '@hcengineering/card' import communication from '@hcengineering/communication' -import core from '@hcengineering/core' export const labelsStore = writable([]) export const messageEditingStore = writable(undefined) @@ -53,6 +52,11 @@ export function isShownTranslatedMessage (messageId: MessageID): boolean { return result?.shown === true && result?.result != null } +export function isCardSubscribed (cardId: Ref): boolean { + const me = getCurrentAccount() + const labelId = cardPlugin.label.Subscribed as string as LabelID + return get(labelsStore).some((it) => it.account === me.uuid && it.cardId === cardId && it.labelId === labelId) +} const query = createLabelsQuery(true) onCommunicationClient(() => { diff --git a/plugins/communication-resources/src/types.ts b/plugins/communication-resources/src/types.ts index d807cb7d8c..29bfba5a36 100644 --- a/plugins/communication-resources/src/types.ts +++ b/plugins/communication-resources/src/types.ts @@ -41,7 +41,7 @@ export interface Action { export interface AppletDraft { id: string - type: AppletType + mimeType: AppletType appletId: Ref params: Record } @@ -49,7 +49,7 @@ export interface AppletDraft { export interface MessageDraft { _id: string content: Markup - blobs: BlobParams[] + blobs: Array links: LinkPreviewParams[] applets: AppletDraft[] } diff --git a/plugins/communication-resources/src/utils.ts b/plugins/communication-resources/src/utils.ts index 5294823628..5757d57eba 100644 --- a/plugins/communication-resources/src/utils.ts +++ b/plugins/communication-resources/src/utils.ts @@ -21,16 +21,16 @@ import { type Card } from '@hcengineering/card' import { AccountRole, type Data, getCurrentAccount, type Ref, type Space, type Markup } from '@hcengineering/core' import { getMetadata, translate } from '@hcengineering/platform' import { addNotification, languageStore, NotificationSeverity, showPopup } from '@hcengineering/ui' -import { type LinkPreviewParams, type Message } from '@hcengineering/communication-types' +import { type Emoji, type LinkPreviewParams, type Message } from '@hcengineering/communication-types' import emoji from '@hcengineering/emoji' import { markdownToMarkup, markupToMarkdown } from '@hcengineering/text-markdown' import { jsonToMarkup, markupToJSON } from '@hcengineering/text' +import { isCardSubscribed, guestCommunicationAllowedCards } from './stores' import IconAt from './components/icons/At.svelte' import communication from './plugin' import { type TextInputAction } from './types' -import { guestCommunicationAllowedCards } from './stores' import { get } from 'svelte/store' import view from '@hcengineering/view' import { type Direct } from '@hcengineering/communication' @@ -51,19 +51,14 @@ export async function subscribe (card: Card): Promise { export async function canSubscribe (card: Card): Promise { const isEnabled = getMetadata(communication.metadata.Enabled) === true if (!isEnabled) return false - const client = getCommunicationClient() - const me = getCurrentAccount() - const collaborator = (await client.findCollaborators({ card: card._id, account: me.uuid, limit: 1 }))[0] - return collaborator === undefined + + return !isCardSubscribed(card._id) } export async function canUnsubscribe (card: Card): Promise { const isEnabled = getMetadata(communication.metadata.Enabled) === true if (!isEnabled) return false - const client = getCommunicationClient() - const me = getCurrentAccount() - const collaborator = (await client.findCollaborators({ card: card._id, account: me.uuid, limit: 1 }))[0] - return collaborator !== undefined + return isCardSubscribed(card._id) } export const defaultMessageInputActions: TextInputAction[] = [ @@ -107,12 +102,11 @@ export function toMarkup (markdown: string): Markup { return jsonToMarkup(markdownToMarkup(markdown)) } -export async function toggleReaction (message: Message, emoji: string): Promise { +export async function toggleReaction (message: Message, emoji: Emoji): Promise { const me = getCurrentAccount() const communicationClient = getCommunicationClient() - const { socialIds } = me - const reaction = message.reactions.find((it) => it.reaction === emoji && socialIds.includes(it.creator)) - if (reaction !== undefined) { + const alreadyAdded = (message.reactions[emoji] ?? []).some((it) => it.person === me.uuid) + if (alreadyAdded) { await communicationClient.removeReaction(message.cardId, message.id, emoji) } else { await communicationClient.addReaction(message.cardId, message.id, emoji) diff --git a/plugins/communication/src/poll.ts b/plugins/communication/src/poll.ts index 4bc360a18b..893fd2ebf9 100644 --- a/plugins/communication/src/poll.ts +++ b/plugins/communication/src/poll.ts @@ -11,9 +11,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { AttachedDoc, Ref } from '@hcengineering/core' +import { AttachedDoc, Ref, AccountUuid } from '@hcengineering/core' import { PersonSpace } from '@hcengineering/contact' -import { AccountID, MessageID } from '@hcengineering/communication-types' +import { MessageID } from '@hcengineering/communication-types' import { Card } from '@hcengineering/card' export interface PollAnswer extends AttachedDoc { @@ -22,7 +22,7 @@ export interface PollAnswer extends AttachedDoc { } export interface UserVote { - account: AccountID + account: AccountUuid options: { id: string, label: string, votedAt: Date }[] } diff --git a/plugins/communication/src/types.ts b/plugins/communication/src/types.ts index e55fcfba21..83ef43892e 100644 --- a/plugins/communication/src/types.ts +++ b/plugins/communication/src/types.ts @@ -11,15 +11,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { - AccountID, - AppletAttachment, - AppletParams, - AppletType, - Message, - MessageID -} from '@hcengineering/communication-types' -import { AttachedDoc, Configuration, Doc, Ref } from '@hcengineering/core' +import { AppletAttachment, AppletParams, AppletType, Message, MessageID } from '@hcengineering/communication-types' +import { AttachedDoc, Configuration, Doc, Ref, AccountUuid } from '@hcengineering/core' import { Asset, IntlString, Resource } from '@hcengineering/platform' import { Card, MasterTag } from '@hcengineering/card' import { AnyComponent } from '@hcengineering/ui' @@ -85,7 +78,7 @@ export interface PollAnswer extends AttachedDoc { } export interface UserVote { - account: AccountID + account: AccountUuid options: { id: string, label: string, votedAt: Date }[] } diff --git a/plugins/contact-assets/lang/cs.json b/plugins/contact-assets/lang/cs.json index d4881e830f..2bea328ec7 100644 --- a/plugins/contact-assets/lang/cs.json +++ b/plugins/contact-assets/lang/cs.json @@ -119,6 +119,7 @@ "EveryoneDescription": "Upozornit všechny v tomto {title}", "HereDescription": "Upozornit všechny v tomto {title}", "Guest": "Host", - "Deleted": "Smazáno" + "Deleted": "Smazáno", + "CannotMerge": "Chyba: Nelze sloučit globální osoby" } } diff --git a/plugins/contact-assets/lang/de.json b/plugins/contact-assets/lang/de.json index 634c6eec40..8152cacf02 100644 --- a/plugins/contact-assets/lang/de.json +++ b/plugins/contact-assets/lang/de.json @@ -119,6 +119,7 @@ "EveryoneDescription": "Benachrichtigen Sie alle in diesem {title}", "HereDescription": "Benachrichtigen Sie alle in diesem {title}", "Guest": "Gast", - "Deleted": "Gelöscht" + "Deleted": "Gelöscht", + "CannotMerge": "Fehler: Globale Personen können nicht zusammengeführt werden" } } diff --git a/plugins/contact-assets/lang/en.json b/plugins/contact-assets/lang/en.json index a9ea12161b..b9241b4115 100644 --- a/plugins/contact-assets/lang/en.json +++ b/plugins/contact-assets/lang/en.json @@ -123,6 +123,7 @@ "EveryoneDescription": "Notify everyone in this {title}", "HereDescription": "Notify every online member in this {title}", "Guest": "Guest", - "Deleted": "Deleted" + "Deleted": "Deleted", + "CannotMerge": "Error: Cannot merge global persons" } } diff --git a/plugins/contact-assets/lang/es.json b/plugins/contact-assets/lang/es.json index f7011d41c4..c568e0a165 100644 --- a/plugins/contact-assets/lang/es.json +++ b/plugins/contact-assets/lang/es.json @@ -123,6 +123,7 @@ "EveryoneDescription": "Notificar a todos en este {title}", "HereDescription": "Notificar a todos en este {title}", "Guest": "Invitado", - "Deleted": "Eliminado" + "Deleted": "Eliminado", + "CannotMerge": "Error: No se pueden fusionar personas globales" } } diff --git a/plugins/contact-assets/lang/fr.json b/plugins/contact-assets/lang/fr.json index e1bc77bb02..ceed59f035 100644 --- a/plugins/contact-assets/lang/fr.json +++ b/plugins/contact-assets/lang/fr.json @@ -123,6 +123,7 @@ "EveryoneDescription": "Notifier tout le monde dans ce {title}", "HereDescription": "Notifier tout le monde dans ce {title}", "Guest": "Invité", - "Deleted": "Supprimé" + "Deleted": "Supprimé", + "CannotMerge": "Erreur : Impossible de fusionner les personnes globales" } } diff --git a/plugins/contact-assets/lang/it.json b/plugins/contact-assets/lang/it.json index c39880e61f..3e4741b080 100644 --- a/plugins/contact-assets/lang/it.json +++ b/plugins/contact-assets/lang/it.json @@ -123,6 +123,7 @@ "EveryoneDescription": "Notifica tutti in questo {title}", "HereDescription": "Notifica tutti in questo {title}", "Guest": "Ospite", - "Deleted": "Eliminato" + "Deleted": "Eliminato", + "CannotMerge": "Errore: Impossibile unire persone globali" } } diff --git a/plugins/contact-assets/lang/ja.json b/plugins/contact-assets/lang/ja.json index b969ddc201..eb4de01ed9 100644 --- a/plugins/contact-assets/lang/ja.json +++ b/plugins/contact-assets/lang/ja.json @@ -123,6 +123,7 @@ "EveryoneDescription": "この{title}のすべてに通知する", "HereDescription": "この{title}のすべてに通知する", "Guest": "ゲスト", - "Deleted": "削除済み" + "Deleted": "削除済み", + "CannotMerge": "エラー：グローバル個人は統合できません" } } \ No newline at end of file diff --git a/plugins/contact-assets/lang/pt.json b/plugins/contact-assets/lang/pt.json index 1689dd68e4..41c4f76349 100644 --- a/plugins/contact-assets/lang/pt.json +++ b/plugins/contact-assets/lang/pt.json @@ -123,6 +123,7 @@ "EveryoneDescription": "Notificar todos neste {title}", "HereDescription": "Notificar todos neste {title}", "Guest": "Convidado", - "Deleted": "Excluído" + "Deleted": "Excluído", + "CannotMerge": "Erro: Não é possível mesclar pessoas globais" } } diff --git a/plugins/contact-assets/lang/ru.json b/plugins/contact-assets/lang/ru.json index 55770a4fa8..4c784a5676 100644 --- a/plugins/contact-assets/lang/ru.json +++ b/plugins/contact-assets/lang/ru.json @@ -123,6 +123,7 @@ "EveryoneDescription": "Уведомить всех в этом {title}", "HereDescription": "Уведомить всех в этом {title}", "Guest": "Гость", - "Deleted": "Удалён" + "Deleted": "Удалён", + "CannotMerge": "Ошибка: Невозможно объединить глобальных персон" } } diff --git a/plugins/contact-assets/lang/tr.json b/plugins/contact-assets/lang/tr.json new file mode 100644 index 0000000000..7fb907b18c --- /dev/null +++ b/plugins/contact-assets/lang/tr.json @@ -0,0 +1,129 @@ +{ + "string": { + "Apply": "Uygula", + "Contacts": "Kişiler", + "Persons": "Kişiler", + "Organizations": "Şirketler", + "CreatePerson": "Kişi", + "CreateOrganization": "Şirket", + "OrganizationNamePlaceholder": "Şirket adı", + "OrganizationsNamePlaceholder": "Şirketler", + "PersonFirstNamePlaceholder": "Ad", + "PersonLastNamePlaceholder": "Soyad", + "PersonLocationPlaceholder": "Konum", + "PersonsNamePlaceholder": "Klasör", + "Name": "İsim", + "SelectFolder": "Klasör seç", + "OrganizationsFolder": "Şirketler klasörü", + "PersonsFolder": "Kişiler klasörü", + "ContactCreateLabel": "Kişi oluştur", + "SearchEmployee": "Çalışan ara...", + "SearchPerson": "Kişi ara...", + "SearchOrganization": "Şirket ara...", + "ContactInfo": "İletişim Bilgisi", + "Contact": "Kişi", + "Location": "Konum", + "Channel": "Kişi kaydı", + "ChannelProvider": "Kanal sağlayıcı", + "Person": "Kişi", + "Organization": "Şirket", + "Employee": "Çalışan", + "DeleteEmployee": "Çalışanı sil", + "DeleteEmployeeDescr": "Çalışanı çalışma alanından silmek istediğinizden emin misiniz?", + "Value": "Değer", + "FullDescription": "Tam açıklama", + "Phone": "Telefon", + "LinkedIn": "LinkedIn", + "GitHub": "GitHub", + "Twitter": "Twitter", + "Google": "Google", + "Telegram": "Telegram", + "PhonePlaceholder": "+90 555 333 7777", + "LinkedInPlaceholder": "https://linkedin.com/in/adisoyad", + "AtPlaceHolder": "@kullaniciadi", + "FacebookPlaceholder": "https://fb.com/adisoyad", + "Facebook": "Facebook", + "HomepagePlaceholder": "https://adisoyad.com", + "Homepage": "Ana sayfa", + "SocialLinks": "Sosyal bağlantılar", + "ViewActivity": "Aktiviteyi görüntüle", + "PersonAlreadyExists": "Kişi zaten mevcut...", + "Status": "Durum", + "SetStatus": "Durum belirle", + "ClearStatus": "Durumu temizle", + "SaveStatus": "Kaydet", + "Cancel": "İptal", + "StatusDueDate": "Bitiş tarihi", + "NoExpire": "Süresiz", + "TypeLabel": "Tip", + "StatusDueDateTooltip": "{date} tarihine kadar", + "CopyToClipboard": "Kopyala", + "ViewFullProfile": "Tam profili görüntüle", + "Member": "Üye", + "Members": "Üyeler", + "NoMembers": "Üye eklenmedi", + "AddMember": "Üye ekle", + "KickEmployee": "Çalışanı çıkar", + "KickEmployeeDescr": "Çalışanı çalışma alanından çıkarmak istediğinizden emin misiniz? Bu işlem geri alınamaz", + "ResendInvite": "Daveti Yeniden Gönder", + "ResendInviteDescr": "Bu kullanıcıya çalışma alanı için daveti yeniden göndermek istediğinizden emin misiniz?", + "Email": "E-posta", + "CreateEmployee": "Çalışan", + "Inactive": "Pasif", + "Active": "Aktif", + "Role": "Rol", + "Birthday": "Doğum günü", + "UseImage": "Ekli fotoğraf", + "UseGravatar": "Gravatar", + "UseColor": "Renk", + "NotSpecified": "Belirtilmedi", + "Whatsapp": "Whatsapp", + "WhatsappPlaceholder": "Whatsapp", + "Skype": "Skype", + "SkypePlaceholder": "Skype", + "Profile": "Profil", + "ProfilePlaceholder": "Profil...", + "CurrentEmployee": "Mevcut çalışan", + "MergePersons": "Kişileri birleştir", + "MergePersonsFrom": "Kaynak kişi", + "MergePersonsTo": "Hedef kişi", + "SelectAvatar": "Avatar seç", + "Avatar": "Avatar", + "AvatarProvider": "Avatar sağlayıcı", + "GravatarsManaged": "Gravatar'lar yönetilir", + "Through": "üzerinden", + "AddMembersHeader": "{value}'e üye ekle:", + "Assigned": "Atanmış", + "Unassigned": "Atanmamış", + "CategoryCurrentUser": "Mevcut kullanıcı", + "CategoryOther": "Diğer", + "NumberMembers": "{count, plural, =0 {üye yok} =1 {1 üye} other {# üye}}", + "Position": "Pozisyon", + "ConfigLabel": "Kişiler", + "ConfigDescription": "Tüm Çalışanlar ve diğer Kişi/Organizasyon kişileri hakkında bilgi tutmak için uzantı.", + "HasMessagesIn": "mesajları var:", + "HasNewMessagesIn": "yeni mesajları var:", + "Employees": "Çalışanlar", + "People": "Kişiler", + "For": "İçin", + "SelectUsers": "Kullanıcıları seç", + "AddGuest": "Misafir ekle", + "ViewProfile": "Profili görüntüle", + "Viber": "Viber", + "ViberPlaceholder": "Viber", + "SocialId": "Sosyal ID", + "SocialIds": "Sosyal ID'ler", + "Type": "Tip", + "Confirmed": "Doğrulandı", + "UserProfile": "Kullanıcı profili", + "DeactivatedAccount": "Devre dışı hesap", + "LocalTime": "yerel saat", + "Everyone": "Herkes", + "Here": "Burada", + "EveryoneDescription": "Bu {title} içindeki herkesi bilgilendir", + "HereDescription": "Bu {title} içindeki çevrimiçi üyeleri bilgilendir", + "Guest": "Misafir", + "Deleted": "Silindi", + "CannotMerge": "Hata: Global kişiler birleştirilemez" + } +} diff --git a/plugins/contact-assets/lang/zh.json b/plugins/contact-assets/lang/zh.json index 2697e480f3..6794a00b40 100644 --- a/plugins/contact-assets/lang/zh.json +++ b/plugins/contact-assets/lang/zh.json @@ -123,6 +123,7 @@ "EveryoneDescription": "通知所有人在此{title}", "HereDescription": "通知所有人在此{title}", "Guest": "访客", - "Deleted": "已删除" + "Deleted": "已删除", + "CannotMerge": "错误：无法合并全局人员" } } diff --git a/plugins/contact-resources/src/components/CreateContact.svelte b/plugins/contact-resources/src/components/CreateContact.svelte index 349077a891..94475b6d28 100644 --- a/plugins/contact-resources/src/components/CreateContact.svelte +++ b/plugins/contact-resources/src/components/CreateContact.svelte @@ -1,7 +1,8 @@ dispatch('close')} on:changeContent >
-
+
!hierarchy.hasMixin(it, contact.mixin.Employee)} bind:value={sourcePersonRef} />
>> -
+
- {#key [targetPersonRf, sourcePersonRef]} - {#if targetPerson && sourcePerson} -
+ {#key [targetPersonRef, sourcePersonRef]} + {#if targetPerson != null && sourcePerson != null} +
+
{/each}
-
+
{/if} {/key} + {#if targetPersonRef != null} +
+ {#if loading} + + {:else if !canMergeGlobalPersons} + + {:else if visibleResultSocialIdentities.length > 0} + + {#each visibleResultSocialIdentities as socialIdentity} +
+ +
+ {/each} + {/if} +
+ {/if} + + diff --git a/plugins/contact-resources/src/components/SelectUsersPopup.svelte b/plugins/contact-resources/src/components/SelectUsersPopup.svelte index 29a2bb38ee..eabb667f25 100644 --- a/plugins/contact-resources/src/components/SelectUsersPopup.svelte +++ b/plugins/contact-resources/src/components/SelectUsersPopup.svelte @@ -31,6 +31,7 @@ export let placeholder: IntlString = presentation.string.Search export let selected: Ref[] = [] export let skipCurrentAccount = false + export let skipAccounts: Ref[] = [] export let disableDeselectFor: Ref[] = [] export let showStatus = true export let skipInactive = false @@ -91,6 +92,7 @@ {showStatus} {disableDeselectFor} {skipCurrentAccount} + {skipAccounts} {skipInactive} on:select={handleSelectionChanged} /> diff --git a/plugins/contact-resources/src/components/SocialIdentityPresenter.svelte b/plugins/contact-resources/src/components/SocialIdentityPresenter.svelte new file mode 100644 index 0000000000..f2649009d1 --- /dev/null +++ b/plugins/contact-resources/src/components/SocialIdentityPresenter.svelte @@ -0,0 +1,56 @@ + + + +{#if socialIdProvider != null} +
+
+ +
+
{value.displayValue ?? value.value}
+
+
+
+{/if} + + diff --git a/plugins/contact-resources/src/components/UsersList.svelte b/plugins/contact-resources/src/components/UsersList.svelte index 339c211a4e..217da8a6d9 100644 --- a/plugins/contact-resources/src/components/UsersList.svelte +++ b/plugins/contact-resources/src/components/UsersList.svelte @@ -28,6 +28,7 @@ export let search: string = '' export let selected: Ref[] = [] export let skipCurrentAccount = false + export let skipAccounts: Ref[] = [] export let disableDeselectFor: Ref[] = [] export let showStatus = true export let skipInactive = false @@ -52,7 +53,7 @@ ? { $search: search } : { [searchField]: { $like: '%' + search + '%' } } : {}), - ...(skipCurrentAccount ? { _id: { $ne: me } } : {}), + ...{ _id: { $nin: skipCurrentAccount ? [...skipAccounts, me] : [...skipAccounts] } }, ...(skipInactive ? { active: true } : {}), ...(skipOnlyLocal ? { personUuid: { $exists: true } } : {}) }, diff --git a/plugins/contact-resources/src/components/person/EmployeePreviewPopup.svelte b/plugins/contact-resources/src/components/person/EmployeePreviewPopup.svelte index e2989784e9..c94722ad8a 100644 --- a/plugins/contact-resources/src/components/person/EmployeePreviewPopup.svelte +++ b/plugins/contact-resources/src/components/person/EmployeePreviewPopup.svelte @@ -133,12 +133,10 @@
{#if !disabled}
-
- -
+
diff --git a/plugins/contact-resources/src/index.ts b/plugins/contact-resources/src/index.ts index 3258a29182..29ebd69c94 100644 --- a/plugins/contact-resources/src/index.ts +++ b/plugins/contact-resources/src/index.ts @@ -103,6 +103,7 @@ import PersonFilterValuePresenter from './components/PersonFilterValuePresenter. import PersonEditor from './components/PersonEditor.svelte' import PersonIcon from './components/PersonIcon.svelte' import PersonPresenter from './components/PersonPresenter.svelte' +import SocialIdentityPresenter from './components/SocialIdentityPresenter.svelte' import PersonIdFilter from './components/PersonIdFilter.svelte' import PersonRefPresenter from './components/PersonRefPresenter.svelte' import SelectAvatars from './components/SelectAvatars.svelte' @@ -127,7 +128,7 @@ import ContactNamePresenter from './components/ContactNamePresenter.svelte' import PersonPreviewProvider from './components/person/PersonPreviewProvider.svelte' import { get } from 'svelte/store' -import { canResendInvitation } from './visibilityTester' +import { canMergePersons, canResendInvitation } from './visibilityTester' import contact from './plugin' import { channelIdentifierProvider, @@ -191,6 +192,7 @@ export { OrganizationPresenter, PersonIcon, PersonPresenter, + SocialIdentityPresenter, PersonRefPresenter, SelectAvatars, SelectUsersPopup, @@ -458,7 +460,8 @@ export default async (): Promise => ({ PersonTooltipProvider: getPersonTooltip, ChannelTitleProvider: channelTitleProvider, ChannelIdentifierProvider: channelIdentifierProvider, - CanResendInvitation: canResendInvitation + CanResendInvitation: canResendInvitation, + CanMergePersons: canMergePersons }, resolver: { Location: resolveLocation, diff --git a/plugins/contact-resources/src/plugin.ts b/plugins/contact-resources/src/plugin.ts index 99fe4b68c2..9ceafba903 100644 --- a/plugins/contact-resources/src/plugin.ts +++ b/plugins/contact-resources/src/plugin.ts @@ -84,7 +84,8 @@ export default mergeIds(contactId, contact, { DeleteEmployee: '' as IntlString, DeleteEmployeeDescr: '' as IntlString, HasMessagesIn: '' as IntlString, - HasNewMessagesIn: '' as IntlString + HasNewMessagesIn: '' as IntlString, + CannotMerge: '' as IntlString }, function: { GetContactLink: '' as Resource<(doc: Doc, props: Record) => Promise>, @@ -94,7 +95,8 @@ export default mergeIds(contactId, contact, { FilterChannelHasMessagesResult: '' as FilterFunction, FilterChannelHasNewMessagesResult: '' as FilterFunction, PersonTooltipProvider: '' as Resource<(client: Client, doc?: Doc | null) => Promise>, - CanResendInvitation: '' as Resource + CanResendInvitation: '' as Resource, + CanMergePersons: '' as Resource }, aggregation: { CreatePersonAggregationManager: '' as CreateAggregationManagerFunc, diff --git a/plugins/contact-resources/src/visibilityTester.ts b/plugins/contact-resources/src/visibilityTester.ts index fc925ba45a..67a5e693b8 100644 --- a/plugins/contact-resources/src/visibilityTester.ts +++ b/plugins/contact-resources/src/visibilityTester.ts @@ -14,8 +14,16 @@ // limitations under the License. // -import { type Employee } from '@hcengineering/contact' +import contact, { type Person, type Employee } from '@hcengineering/contact' +import { getClient } from '@hcengineering/presentation' export async function canResendInvitation (employee: Employee): Promise { return !employee.active } + +export async function canMergePersons (person: Person): Promise { + const client = getClient() + const hierarchy = client.getHierarchy() + + return hierarchy.hasMixin(person, contact.mixin.Employee) +} diff --git a/plugins/contact/src/utils.ts b/plugins/contact/src/utils.ts index 4de3abd799..028418a725 100644 --- a/plugins/contact/src/utils.ts +++ b/plugins/contact/src/utils.ts @@ -587,6 +587,7 @@ export async function ensureEmployeeForPerson ( export const contactCache = ContactCache.instance export async function loadCachesForPersonId (client: Client, personId: PersonId): Promise { + if (personId == null || personId === '') return const sidObj = await client.findOne( contact.class.SocialIdentity, { diff --git a/plugins/controlled-documents-assets/lang/tr.json b/plugins/controlled-documents-assets/lang/tr.json new file mode 100644 index 0000000000..892f90aab8 --- /dev/null +++ b/plugins/controlled-documents-assets/lang/tr.json @@ -0,0 +1,284 @@ +{ + "string": { + "ID": "ID", + "Code": "Kod", + "Number": "Numara", + "Category": "Kategori", + "CollaborativeDocument": "İşbirlikli doküman", + "ControlledDocument": "Kontrollü doküman", + "Requests": "Talepler", + "EffectiveDate": "Yürürlük tarihi", + "PlannedEffectiveDate": "Planlanan yürürlük tarihi", + "Rank": "Sıra", + "DocumentRequest": "Talep", + "DocumentReviewRequest": "Doküman inceleme talebi", + "DocumentApprovalRequest": "Doküman onay talebi", + "ControlledStatus": "Kontrol durumu", + "Categories": "Kategoriler", + "Guidance": "Rehber", + "Required": "Gerekli", + "Description": "Açıklama", + "Major": "Majör", + "Minor": "Minör", + "Patch": "Yama", + "ValidationWorkflow": "Doğrulama iş akışı", + "Creator": "Oluşturan", + "ChangeOwner": "Doküman yazarını değiştir", + "ChangeOwnerHintBeginning": "Yazarlığı", + "ChangeOwnerHintEnd": "başka bir kişiye aktar.", + "ChangeOwnerWarning": "Bu işlemden sonra bu dokümanı düzenleyemeyeceksiniz.", + "SelectOwner": "Yeni yazar seç", + "CreateDocument": "Yeni doküman oluştur", + "CreateTemplate": "Yeni şablon oluştur", + "Documents": "Dokümanlar", + "Document": "Doküman", + "NewDocumentDialogClose": "Bu diyalogu kapatmak istiyor musunuz?", + "NewDocumentCloseNote": "Tüm değişiklikler kaybolacak", + "Cancel": "İptal", + "EditorPlaceholder": "düzenlemeye başlamak için yazın...", + "Version": "Sürüm", + "TemplateVersion": "Şablon sürümü", + "VersionValue": "v{major}.{minor}", + "SearchDocument": "Doküman ara...", + "CreateEnVersion": "İnceleme için sürüm oluştur", + "Approvers": "Onaylayanlar", + "CoAuthors": "Ortak Yazarlar", + "Status": "Durum", + "TemplateName": "Şablon adı", + "DocumentApplication": "Kontrollü Dokümanlar", + "MyDocuments": "Dokümanlarım", + "Library": "Kütüphane", + "Labels": "Etiketler", + "Author": "Yazar", + "Review": "İnceleme", + "Approval": "Onay", + "Reviewer": "İnceleyici", + "Approver": "Onaylayan", + "DeleteCategory": "Kategori silinsin mi?", + "DeleteCategoryHint": "Bu işlem geri alınamaz", + "DeleteCategoryWarning": "Kategori kullanımda olduğu için silinemez", + "Latest": "Güncel", + "Draft": "Taslak", + "Reviewers": "İnceleyiciler", + "ViewMode": "Görüntüleme", + "EditMode": "Düzenleme", + "ComparisonMode": "Karşılaştırma", + "Compare": "Karşılaştır:", + "Against": "İle:", + "ComparisonModeNotSupported": "Karşılaştırma modu desteklenmiyor.", + "CreateDraft": "Taslak Oluştur", + "SendForApproval": "Onaya gönder", + "SendForReview": "İncelemeye gönder", + "CompleteReview": "İncelemeyi tamamla", + "Approve": "Onayla", + "Reject": "Reddet", + "ConfirmApproval": "Onayı onayla", + "ConfirmRejection": "Reddi onayla", + "ProvideRejectionReason": "Red nedenini yazın...", + "RejectionReason": "Red nedeni", + "ConfirmReviewCompletion": "İnceleme tamamlamayı onayla", + "ConfirmApprovalSubmission": "Onay gönderimini onayla", + "ConfirmReviewSubmission": "İnceleme gönderimini onayla", + "AddApprovalTitle": "Dokümanınızı onaylayanlar gönder", + "AddApprovalDescription1": "Dokümanınızı onaya hazırlamak için birkaç gereksinimi karşılaması gerekir:", + "AddApprovalDescription2": "'Taslak' veya 'İncelendi' durumunda olmalı", + "AddApprovalDescription3": "çözülmemiş yorumu olmamalı", + "AddApprovalDescription4": "eğitim planlanmışsa, eğitimin durumu 'Yayınlandı' olmalı", + "NoApprovalsDescription": "Bu doküman sürümü için onay yok", + "CurrentVersion": "Mevcut sürüm", + "DocumentTemplate": "Şablon", + "DocumentTemplates": "Şablonlar", + "DocumentCode": "Doküman kodu", + "TemplateCode": "Şablon kodu", + "DocumentCodePlaceholder": "DOC-1", + "DocumentPrefixPlaceholder": "DOC", + "DocumentPrefix": "Doküman öneki", + "DocumentTemplateCreateLabel": "Şablon", + "DocumentCategoryCreateLabel": "Kategori", + "CreateDocumentCategory": "Kategori oluştur", + "DocumentCategoryAlreadyExists": "\"{title}\" kategorisi zaten mevcut. ", + "DocumentCategoryCodeAlreadyExists": "\"{code}\" kodu zaten kullanılıyor. ", + "AttachmentsMax": "İzin verilen maksimum ek", + "Resolve": "Çöz", + "Unresolve": "Çözülmemiş yap", + "Pending": "Beklemede", + "Resolved": "Çözüldü", + "ShowResolved": "Çözülen yorumları göster", + "Ordering": "Sıralama", + "Title": "Başlık", + "Effective": "Yürürlükte", + "Archived": "Arşivlendi", + "Deleted": "Silindi", + "MetaAbstract": "Özet", + "Obsolete": "Geçersiz", + "MakeDocumentObsolete": "Geçersiz olarak işaretle", + "MakeDocumentObsoleteDialog": "{count, plural, =0 {dokümanı} other {dokümanları}} geçersiz olarak işaretle", + "MakeDocumentObsoleteConfirm": "Şu dokümanları gerçekten geçersiz olarak işaretlemek istiyor musunuz: {titles}?", + "ContentTab": "İçerik", + "TeamTab": "Takım", + "MetaTab": "Meta veriler", + "ChangeControlTab": "Değişiklik kontrolü", + "ReleaseTab": "Yayın", + "HistoryTab": "Geçmiş", + "ModificationDate": "Değiştirilme tarihi", + "Modified": "Değiştirildi", + "Owner": "Sahip", + "AssignedTo": "Atanan", + "Unassigned": "Atanmamış", + "Untitled": "Başlıksız", + "Copy": "kopyala", + "AccessWorkarea": "Çalışma Alanına Erişim", + "EffectiveLibrary": "Yürürlükteki kütüphane", + "WorkingLibrary": "Çalışma kütüphanesi", + "CreateDraftQmsDocuments": "Taslak QMS dokümanları oluştur", + "OwnDocumentAskReviewGetApproval": "QMS dokümanına sahip ol, inceleme iste, onay al", + "ApproveDocuments": "Dokümanları onayla", + "ReassignOwnershipToAnotherUser": "Sahipliği başka bir kullanıcıya devret", + "MakeDocumentEffective": "Dokümanı yürürlüğe koy", + "CreateDraftQmsTemplates": "Taslak QMS şablonları oluştur", + "ChangeControl": "Değişiklik Kontrolü", + "ReviewInterval": "İnceleme aralığı", + "SelectReviewers": "İnceleyicileri seç", + "SelectApprovers": "Onaylayanları seç", + "RequestsToReviewTheDoc": "dokümanı incelemenizi talep ediyor", + "RequestsToApproveTheDoc": "dokümanı onaylamanızı talep ediyor", + "Parent": "Üst", + "Template": "Şablon", + "GeneralInfo": "Genel Bilgi", + "InProgress": "Devam ediyor", + "EditDescription": "Açıklamayı düzenle", + "EditGuidance": "Rehberi düzenle", + "NewDocument": "Yeni doküman", + "NewDocumentCategory": "Yeni kategori", + "NewDocumentTemplate": "Yeni şablon", + "LocationStepTitle": "Konum", + "TemplateStepTitle": "Şablon", + "InfoStepTitle": "Bilgi", + "TeamStepTitle": "Takım", + "TitleAndDescr": "Başlık ve açıklama", + "Reason": "Neden", + "AbstractPlaceholder": "Bu doküman ne hakkında? Kime ve ne zaman gerekecek? ...", + "NewDocCreation": "Yeni doküman oluşturma", + "NewTemplateCreation": "Yeni şablon oluşturma", + "NewTemplatePlaceholder": "Bu şablon ne hakkında? Nasıl düzgün kullanılacağını açıklayın...", + "CustomReason": "Özel", + "ReasonPlaceholder": "Nedeni belirtin...", + "EditDocument": "Dokümanı düzenle", + "Key": "Anahtar", + "CommentsSequence": "Yorum sırası", + "Email": "E-posta", + "Password": "Şifre", + "FieldIsEmpty": "{field} boş", + "ValidatingCredentials": "Kimlik bilgileri doğrulanıyor...", + "GeneralDocumentation": "Genel dokümantasyon", + "TechnicalDocumentation": "Teknik dokümantasyon", + "UnsortedTemplates": "Sıralanmamış şablonlar", + "Project": "Proje", + "Projects": "Projeler", + "ExternalSpace": "Proje alanı", + "DocumentSpaceType": "Doküman alan tipi", + "EffectiveImmediately": "Onay üzerine hemen", + "EffectiveOn": "Yürürlüğe alma tarihi", + "PeriodicReviewToBeCompleted": "Periyodik inceleme tamamlanmalı:", + "MonthsAfterEffectiveDate": "ay yürürlük tarihinden sonra", + "ToBePassedWithin": "İçinde geçilmeli", + "AttemptsAnd": "deneme ve", + "DaysAfterEffectiveDate": "gün yürürlük tarihinden sonra", + "Index": "İndeks", + "Path": "Yol", + "CreateChildDocument": "Alt doküman oluştur", + "CreateChildTemplate": "Alt şablon oluştur", + "All": "Tümü", + "Space": "Alan", + "SelectParent": "Dokümanınız için üst nesne seçin", + "PrefixInUse": "Bu önek zaten kullanılıyor:", + "CodeInUse": "Bu kod zaten kullanılıyor:", + "ChangeCode": "Kodu Değiştir", + "ChangePrefix": "Öneki Değiştir", + "MarkDocAsDeleted": "Dokümanı silinmiş olarak işaretle", + "MarkDocsAsDeleted": "Birden fazla dokümanı silinmiş olarak işaretle", + "MarkDocAsDeletedConfirm": "Şu dokümanları gerçekten silinmiş olarak işaretlemek istiyor musunuz: {titles}?", + "ArchiveDocs": "{count, plural, =0 {dokümanı} other {dokümanları}} arşivle", + "ArchiveDocsConfirm": "Şu dokümanları gerçekten arşivlemek istiyor musunuz: {titles}?", + "DocumentInHierarchy": "Hiyerarşide doküman", + "FirstDraftVersion": "Bu, dokümanın ilk taslak sürümü. Henüz geçmiş yok.", + "EffectiveDocumentLifecycle": "Yürürlükteki doküman yaşam döngüsü", + "ReasonAndImpact": "Neden ve Etki", + "ImpactAnalysis": "Etki analizi", + "ImpactedDocuments": "Etkilenen dokümanlar", + "CreateDocumentFailed": "Doküman oluşturulamadı", + "CreateDocumentTemplateFailed": "Şablon oluşturulamadı", + "TryAgain": "Lütfen tekrar deneyin", + "DescribeChanges": "Nelerin değiştiğini açıklayın...", + "DescribeReason": "Neden değiştiğini açıklayın...", + "DescribeImpact": "Etkisi var:", + "AddDocument": "Doküman ekle", + "NoDocuments": "Doküman yok", + "SysTemplate": "Sistem şablonu", + "DocumentTrainingDueDays": "Son tarih günleri", + "DocumentTrainingEnabled": "Etkin", + "Own": "Sahip", + "Snapshot": "Anlık görüntü", + "Snapshots": "Anlık görüntüler", + "ControlledSnapshot": "Kontrollü anlık görüntü", + "Name": "İsim", + "DraftRevision": "Taslak revizyonu", + "CreateNewDraft": "Yeni sürüm taslağı", + "RestoreDraft": "Taslağı geri yükle", + "ChangeSeverity": "Değişiklik şiddeti", + "Reference": "Referans", + "History": "Geçmiş", + "Signatories": "İmzalayanlar", + "Page": "Sayfa ", + "Of": " / ", + "CreatedFromTemplate": "Şablondan oluşturuldu: ", + "ViewAll": "Tümünü görüntüle", + "Readonly": "Salt okunur", + "NewDocumentSpace": "Yeni doküman alanı", + "EditDocumentSpace": "Doküman alanını düzenle", + "DocSpaceDescriptionPlaceholder": "Alanınızı açıklayın...", + "Members": "Üyeler", + "RoleLabel": "Rol: {role}", + "CreateOrgSpace": "Organizasyon alanı oluştur", + "ReviewDocumentPermission": "Dokümanı incele", + "ReviewDocumentDescription": "Kullanıcılara doküman inceleme yetkisi verir", + "ApproveDocumentPermission": "Dokümanı onayla", + "ApproveDocumentDescription": "Kullanıcılara doküman onaylama yetkisi verir", + "ArchiveDocumentPermission": "Dokümanı arşivle", + "ArchiveDocumentDescription": "Kullanıcılara doküman arşivleme yetkisi verir", + "CoAuthorDocumentPermission": "Doküman ortak yazarı", + "CoAuthorDocumentDescription": "Kullanıcılara doküman ortak yazarlığı yetkisi verir", + "CreateDocumentPermission": "Doküman oluştur", + "CreateDocumentDescription": "Kullanıcılara doküman oluşturma yetkisi verir", + "UpdateDocumentOwnerPermission": "Doküman sahibini güncelle", + "UpdateDocumentOwnerDescription": "Kullanıcılara doküman sahibini güncelleme yetkisi verir", + "CreateDocumentCategoryPermission": "Doküman kategorisi oluştur", + "CreateDocumentCategoryDescription": "Kullanıcılara doküman kategorisi oluşturma yetkisi verir", + "UpdateDocumentCategoryPermission": "Doküman kategorisini güncelle", + "UpdateDocumentCategoryDescription": "Kullanıcılara doküman kategorisini güncelleme yetkisi verir", + "DeleteDocumentCategoryPermission": "Doküman kategorisini sil", + "DeleteDocumentCategoryDescription": "Kullanıcılara doküman kategorisini silme yetkisi verir", + "ConfigLabel": "Kontrollü Dokümanlar", + "ConfigDescription": "Kontrollü dokümanları yönetmek için uzantı", + "Transfer": "Aktar", + "TransferWarning": "Bu işlemden sonra bazı takım üyeleri bu dokümanı görüntüleme veya düzenleme yeteneğini kaybedebilir.", + "TransferDocuments": "Kontrollü dokümanları aktar", + "TransferDocumentsHint": "Seçilen alana aktarılacak dokümanlar:", + "CreateFolder": "Yeni klasör oluştur", + "RenameFolder": "Klasörü yeniden adlandır", + "CreateChildFolder": "Alt klasör oluştur", + "LatestVersionHint": "en güncel", + "CannotDeleteFolder": "Klasör silinemez", + "CannotDeleteFolderHint": "Klasörü silmeden önce lütfen tüm alt dokümanları başka bir konuma taşıyın.", + "AllDocumentSpaces": "Tüm doküman alanları" + }, + "controlledDocStates": { + "Empty": "", + "Approved": "Onaylandı", + "InApproval": "Onayda", + "InReview": "İncelemede", + "Reviewed": "İncelendi", + "Rejected": "Reddedildi", + "ToReview": "İncelemeye" + } +} diff --git a/plugins/controlled-documents-resources/src/components/document/popups/AddCommentPopup.svelte b/plugins/controlled-documents-resources/src/components/document/popups/AddCommentPopup.svelte index 034f56241d..f8321ce8a6 100644 --- a/plugins/controlled-documents-resources/src/components/document/popups/AddCommentPopup.svelte +++ b/plugins/controlled-documents-resources/src/components/document/popups/AddCommentPopup.svelte @@ -4,10 +4,12 @@ import chunter, { type ChatMessage } from '@hcengineering/chunter' import { Ref, generateId } from '@hcengineering/core' import { ReferenceInput } from '@hcengineering/text-editor-resources' + import { popupstore as popups } from '@hcengineering/ui' import { addDocumentCommentFx } from '../../../stores/editors/document' export let nodeId: string | undefined + export let popupId: string | undefined const dispatch = createEventDispatcher() @@ -22,7 +24,8 @@ function handleClick (event: MouseEvent): void { if (event.target instanceof Node) { - if (popup !== undefined && !popup.contains(event.target)) { + const top = $popups.length > 0 && $popups[$popups.length - 1].id === popupId + if (top && popup !== undefined && !popup.contains(event.target)) { event.preventDefault() event.stopPropagation() dispatch('close', undefined) diff --git a/plugins/controlled-documents-resources/src/plugin.ts b/plugins/controlled-documents-resources/src/plugin.ts index 548550e46f..aa483141f0 100644 --- a/plugins/controlled-documents-resources/src/plugin.ts +++ b/plugins/controlled-documents-resources/src/plugin.ts @@ -44,6 +44,9 @@ export default mergeIds(documentsId, documents, { CreateDocumentsSpace: '' as AnyComponent, CreateDocumentSpaceType: '' as AnyComponent }, + ids: { + AddCommentPopup: '' as Resource + }, string: { ID: '' as IntlString, ValidationWorkflow: '' as IntlString, diff --git a/plugins/controlled-documents-resources/src/stores/editors/document/canRestoreDraft.ts b/plugins/controlled-documents-resources/src/stores/editors/document/canRestoreDraft.ts index fd9b147862..98af9cdf3c 100644 --- a/plugins/controlled-documents-resources/src/stores/editors/document/canRestoreDraft.ts +++ b/plugins/controlled-documents-resources/src/stores/editors/document/canRestoreDraft.ts @@ -23,7 +23,7 @@ export const $canRestoreDraft = combine( $documentLatestVersion, $canCreateNewDraft, (document, latest, canCreateNewDraft) => { - if (latest === null || document == null) return false + if (latest == null || document == null) return false return canCreateNewDraft && latest._id === document._id && document.state === DocumentState.Deleted } ) diff --git a/plugins/controlled-documents-resources/src/stores/editors/document/documentComments.ts b/plugins/controlled-documents-resources/src/stores/editors/document/documentComments.ts index bef590700b..65e761ee8f 100644 --- a/plugins/controlled-documents-resources/src/stores/editors/document/documentComments.ts +++ b/plugins/controlled-documents-resources/src/stores/editors/document/documentComments.ts @@ -16,7 +16,7 @@ import { type Attachment } from '@hcengineering/attachment' import { type Ref, generateId } from '@hcengineering/core' import { getClient } from '@hcengineering/presentation' import { type CompAndProps, type PopupAlignment, popupstore, showPopup } from '@hcengineering/ui' -import documents, { type Document, type DocumentComment } from '@hcengineering/controlled-documents' +import { type Document, type DocumentComment } from '@hcengineering/controlled-documents' import { isDocumentCommentAttachedTo } from '../../../utils' import { type DocumentCommentsFilter, @@ -36,6 +36,8 @@ import { controlledDocumentOpened } from './actions' +import documents from '../../../plugin' + export const $areDocumentCommentPopupsOpened = createStore(false).on( documentCommentPopupsOpened, (_, isOpened) => isOpened @@ -118,7 +120,10 @@ export const showDocumentCommentsPopupFx = createEffect( export const showAddCommentPopupFx = createEffect((payload: { element?: PopupAlignment, nodeId?: string | null }) => { showPopup( documents.component.AddCommentPopup, - payload, + { + ...payload, + popupId: documents.ids.AddCommentPopup + }, payload.element, (result) => { if (result === null || result === undefined) { @@ -129,7 +134,11 @@ export const showAddCommentPopupFx = createEffect((payload: { element?: PopupAli } }, undefined, - { category: DocumentCommentPopupCategory, overlay: true } + { + id: documents.ids.AddCommentPopup, + category: DocumentCommentPopupCategory, + overlay: true + } ) }) diff --git a/plugins/desktop-downloads-assets/lang/tr.json b/plugins/desktop-downloads-assets/lang/tr.json new file mode 100644 index 0000000000..19c2b63bbe --- /dev/null +++ b/plugins/desktop-downloads-assets/lang/tr.json @@ -0,0 +1,10 @@ +{ + "string": { + "Downloads": "İndirilenler", + "Completed": "Tamamlandı", + "Cancelled": "İptal Edildi", + "Interrupted": "Kesintiye Uğradı", + "Paused": "Duraklatıldı", + "Progressing": "Devam Ediyor" + } +} diff --git a/plugins/desktop-preferences-assets/lang/tr.json b/plugins/desktop-preferences-assets/lang/tr.json new file mode 100644 index 0000000000..c6526a7a67 --- /dev/null +++ b/plugins/desktop-preferences-assets/lang/tr.json @@ -0,0 +1,11 @@ +{ + "string": { + "ShowNotifications": "Bildirimleri göster", + "PlaySound": "Ses çal", + "BounceAppIcon": "Uygulama simgesini zıplat (sadece mac)", + "ShowBadge": "Uygulama simgesinde rozet göster", + "SoundAndAppearance": "Ses ve görünüm", + "HaveGotANotification": "Bir bildiriminiz var", + "TotalNotificationsCount": "Toplam {count, plural, =1 {# bildiriminiz} other {# bildiriminiz}} var" + } +} diff --git a/plugins/diffview-assets/lang/tr.json b/plugins/diffview-assets/lang/tr.json new file mode 100644 index 0000000000..f0391d359e --- /dev/null +++ b/plugins/diffview-assets/lang/tr.json @@ -0,0 +1,14 @@ +{ + "string": { + "ViewMode": "Görüntüleme modu", + "Unified": "Birleşik", + "Split": "Bölünmüş", + "Viewed": "Görüntülendi", + "ShowDiff": "Farkı göster", + "NoChanges": "Dosya farkında değişiklik yok", + "LargeDiffsAreHidden": "Büyük farklar varsayılan olarak gösterilmez.", + "FileIsTooLarge": "Dosya görüntülenemeyecek kadar büyük.", + "FileWasRenamed": "Dosya değişiklik olmadan yeniden adlandırıldı.", + "FileWasDeleted": "Dosya silindi." + } +} diff --git a/plugins/document-assets/lang/cs.json b/plugins/document-assets/lang/cs.json index 479bcc7053..c203afa1a4 100644 --- a/plugins/document-assets/lang/cs.json +++ b/plugins/document-assets/lang/cs.json @@ -58,6 +58,8 @@ "Icon": "Ikona", "Color": "Barva", - "RoleLabel": "Role: {role}" + "RoleLabel": "Role: {role}", + "ForbidCreateTeamspacePermission": "Zakázat vytvoření týmového prostoru", + "ForbidCreateTeamspacePermissionDescription": "Zakazuje uživatelům vytvářet nové týmové prostory" } -} \ No newline at end of file +} diff --git a/plugins/document-assets/lang/de.json b/plugins/document-assets/lang/de.json index 0e5520c55d..f131b6e020 100644 --- a/plugins/document-assets/lang/de.json +++ b/plugins/document-assets/lang/de.json @@ -51,6 +51,8 @@ "ConfigDescription": "Erweiterung für kollaborative Dokumentbearbeitung", "Icon": "Symbol", "Color": "Farbe", - "RoleLabel": "Rolle: {role}" + "RoleLabel": "Rolle: {role}", + "ForbidCreateTeamspacePermission": "Arbeitsbereichserstellung verbieten", + "ForbidCreateTeamspacePermissionDescription": "Verbietet Benutzern das Erstellen neuer Arbeitsbereiche" } -} \ No newline at end of file +} diff --git a/plugins/document-assets/lang/en.json b/plugins/document-assets/lang/en.json index ae4f37299e..674a62c557 100644 --- a/plugins/document-assets/lang/en.json +++ b/plugins/document-assets/lang/en.json @@ -58,6 +58,8 @@ "Icon": "Icon", "Color": "Color", - "RoleLabel": "Role: {role}" + "RoleLabel": "Role: {role}", + "ForbidCreateTeamspacePermission": "Forbid create teamspace", + "ForbidCreateTeamspacePermissionDescription": "Forbid users creating new teamspaces" } -} \ No newline at end of file +} diff --git a/plugins/document-assets/lang/es.json b/plugins/document-assets/lang/es.json index 996f38ab82..3ba27bdf4d 100644 --- a/plugins/document-assets/lang/es.json +++ b/plugins/document-assets/lang/es.json @@ -51,6 +51,8 @@ "ConfigDescription": "Extensión para edición colaborativo de documentos", "Icon": "Icono", "Color": "Color", - "RoleLabel": "Role: {role}" + "RoleLabel": "Role: {role}", + "ForbidCreateTeamspacePermission": "Prohibir crear espacio de trabajo", + "ForbidCreateTeamspacePermissionDescription": "Prohíbe a los usuarios crear nuevos espacios de trabajo" } -} \ No newline at end of file +} diff --git a/plugins/document-assets/lang/fr.json b/plugins/document-assets/lang/fr.json index ba9468e0ee..1c718b8c90 100644 --- a/plugins/document-assets/lang/fr.json +++ b/plugins/document-assets/lang/fr.json @@ -51,6 +51,8 @@ "ConfigDescription": "Extension pour l'édition collaborative de documents", "Icon": "Icône", "Color": "Couleur", - "RoleLabel": "Rôle : {role}" + "RoleLabel": "Rôle : {role}", + "ForbidCreateTeamspacePermission": "Interdire la création d'espace d'équipe", + "ForbidCreateTeamspacePermissionDescription": "Interdit aux utilisateurs de créer de nouveaux espaces d'équipe" } -} \ No newline at end of file +} diff --git a/plugins/document-assets/lang/it.json b/plugins/document-assets/lang/it.json index 58ba65975d..4f1f64525c 100644 --- a/plugins/document-assets/lang/it.json +++ b/plugins/document-assets/lang/it.json @@ -51,6 +51,8 @@ "ConfigDescription": "Estensione per la modifica collaborativa dei documenti", "Icon": "Icona", "Color": "Colore", - "RoleLabel": "Ruolo: {role}" + "RoleLabel": "Ruolo: {role}", + "ForbidCreateTeamspacePermission": "Vieta creazione teamspace", + "ForbidCreateTeamspacePermissionDescription": "Vieta agli utenti di creare nuovi teamspaces" } } diff --git a/plugins/document-assets/lang/ja.json b/plugins/document-assets/lang/ja.json index 5de4c1d68f..7d1c081a90 100644 --- a/plugins/document-assets/lang/ja.json +++ b/plugins/document-assets/lang/ja.json @@ -51,6 +51,8 @@ "ConfigDescription": "共同ドキュメント編集のための拡張機能", "Icon": "アイコン", "Color": "色", - "RoleLabel": "ロール: {role}" + "RoleLabel": "ロール: {role}", + "ForbidCreateTeamspacePermission": "チームスペースの作成禁止", + "ForbidCreateTeamspacePermissionDescription": "ユーザーが新しいチームスペースを作成することを禁止します" } } diff --git a/plugins/document-assets/lang/pt.json b/plugins/document-assets/lang/pt.json index eff835270d..82b318f09e 100644 --- a/plugins/document-assets/lang/pt.json +++ b/plugins/document-assets/lang/pt.json @@ -51,6 +51,8 @@ "ConfigDescription": "Extensão para edição colaborativa de documentos", "Icon": "Ícone", "Color": "Cor", - "RoleLabel": "Papel: {role}" + "RoleLabel": "Papel: {role}", + "ForbidCreateTeamspacePermission": "Proibir criação de espaço de trabalho", + "ForbidCreateTeamspacePermissionDescription": "Proíbe os utilizadores de criar novos espaços de trabalho" } -} \ No newline at end of file +} diff --git a/plugins/document-assets/lang/ru.json b/plugins/document-assets/lang/ru.json index 0c453563f7..24edc9adba 100644 --- a/plugins/document-assets/lang/ru.json +++ b/plugins/document-assets/lang/ru.json @@ -58,6 +58,8 @@ "Icon": "Иконка", "Color": "Цвет", - "RoleLabel": "Роль: {role}" + "RoleLabel": "Роль: {role}", + "ForbidCreateTeamspacePermission": "Запретить создание пространства", + "ForbidCreateTeamspacePermissionDescription": "Запрещает пользователям создавать новые пространства" } -} \ No newline at end of file +} diff --git a/plugins/document-assets/lang/tr.json b/plugins/document-assets/lang/tr.json new file mode 100644 index 0000000000..62d97d7498 --- /dev/null +++ b/plugins/document-assets/lang/tr.json @@ -0,0 +1,56 @@ +{ + "string": { + "Document": "Doküman", + "ParentDocument": "Üst doküman", + "ChildDocument": "Alt doküman", + "CreateDocument": "Doküman oluştur", + "Documents": "Dokümanlar", + "CreateAnVersion": "Yeni sürüm oluştur", + "DocumentNamePlaceholder": "Başlıksız", + "Name": "İsim", + "Cancel": "İptal", + "Version": "Sürüm", + "SearchDocument": "Doküman ara...", + "Snapshot": "Anlık görüntü", + "NoVersions": "Sürüm tanımlanmamış", + "DocumentApplication": "Dokümanlar", + "MyDocuments": "Dokümanlarım", + "Teamspace": "Takım alanı", + "Teamspaces": "Takım alanları", + "Labels": "Etiketler", + "AddLabel": "Etiket ekle", + "Authors": "Yazarlar", + "Backlinks": "Geri bağlantılar", + "History": "Geçmiş", + "DescriptionPlaceholder": "detaylar için yazın...", + "CreateTeamspace": "Takım alanı oluştur", + "EditTeamspace": "Takım alanını düzenle", + "NewTeamspace": "Yeni takım alanı", + "TeamspaceTitle": "Takım alanı başlığı", + "TeamspaceTitlePlaceholder": "Yeni takım alanı", + "TeamspaceDescriptionPlaceholder": "Açıklama ekle ...", + "ChooseIcon": "İkon seç", + "TeamspaceMembers": "Üyeler", + "NoParentDocument": "Üst doküman yok", + "NoBacklinks": "Geri bağlantı yok", + "NoHistory": "Önceki geçmiş yok", + "Untitled": "Başlıksız", + "Description": "Açıklama", + "CopyDocumentUrl": "Doküman URL'sini panoya kopyala", + "DocumentUrlCopied": "Kopyalandı!", + "ViewMode": "Görüntüle", + "EditMode": "Düzenle", + "SuggestMode": "Öner", + "CompareTo": "Karşılaştır...", + "Star": "Yıldızla", + "Unstar": "Yıldızı kaldır", + "Lock": "Kilitle", + "Unlock": "Kilidi aç", + "Locked": "Kilitli", + "ConfigLabel": "Dokümanlar", + "ConfigDescription": "İşbirlikli doküman düzenleme için uzantı", + "Icon": "İkon", + "Color": "Renk", + "RoleLabel": "Rol: {role}" + } +} diff --git a/plugins/document-assets/lang/zh.json b/plugins/document-assets/lang/zh.json index e0cfac4fc5..79ea81a8aa 100644 --- a/plugins/document-assets/lang/zh.json +++ b/plugins/document-assets/lang/zh.json @@ -62,6 +62,8 @@ "ReassignToDoConfirm": "您要更改待办事项被指派人吗？待办事项将从当前被指派人的计划中移除。", "Icon": "图标", "Color": "颜色", - "RoleLabel": "角色：{role}" + "RoleLabel": "角色：{role}", + "ForbidCreateTeamspacePermission": "禁止创建团队空间", + "ForbidCreateTeamspacePermissionDescription": "禁止用户创建新团队空间" } } diff --git a/plugins/document-resources/src/components/NewDocumentHeader.svelte b/plugins/document-resources/src/components/NewDocumentHeader.svelte index 38921c34c1..dd17effa9f 100644 --- a/plugins/document-resources/src/components/NewDocumentHeader.svelte +++ b/plugins/document-resources/src/components/NewDocumentHeader.svelte @@ -13,17 +13,9 @@ // limitations under the License. --> -{#if loading} - -{:else} -
- {#if hasTeamspace} - { - void dropdownItemSelected(ev.detail) - }} - /> - {:else} -
-{/if} + diff --git a/plugins/document/src/plugin.ts b/plugins/document/src/plugin.ts index a8a47f81a0..99293c8574 100644 --- a/plugins/document/src/plugin.ts +++ b/plugins/document/src/plugin.ts @@ -13,7 +13,7 @@ // limitations under the License. // -import type { Class, Doc, Mixin, Ref, SpaceType, SpaceTypeDescriptor } from '@hcengineering/core' +import type { Class, Doc, Mixin, Ref, SpaceType, SpaceTypeDescriptor, Permission } from '@hcengineering/core' import { NotificationGroup, NotificationType } from '@hcengineering/notification' import type { Asset, Plugin, Resource } from '@hcengineering/platform' import { IntlString, plugin } from '@hcengineering/platform' @@ -69,7 +69,9 @@ export const documentPlugin = plugin(documentId, { string: { ConfigLabel: '' as IntlString, CreateDocument: '' as IntlString, - Documents: '' as IntlString + Documents: '' as IntlString, + ForbidCreateTeamspacePermission: '' as IntlString, + ForbidCreateTeamspacePermissionDescription: '' as IntlString }, ids: { NoParent: '' as Ref, @@ -81,6 +83,9 @@ export const documentPlugin = plugin(documentId, { }, spaceType: { DefaultTeamspaceType: '' as Ref + }, + permission: { + ForbidCreateTeamspace: '' as Ref } }) diff --git a/plugins/drive-assets/lang/cs.json b/plugins/drive-assets/lang/cs.json index 20717a8c20..84b74e4a59 100644 --- a/plugins/drive-assets/lang/cs.json +++ b/plugins/drive-assets/lang/cs.json @@ -27,6 +27,8 @@ "Rename": "Přejmenovat", "Restore": "Obnovit", "RoleLabel": "Role", - "Root": "/" + "Root": "/", + "ForbidCreateDrivePermission": "Zakázat vytvoření disku", + "ForbidCreateDrivePermissionDescription": "Zakazuje uživatelům vytvářet nové disky" } -} \ No newline at end of file +} diff --git a/plugins/drive-assets/lang/de.json b/plugins/drive-assets/lang/de.json index ad38f7d033..78a7b901c5 100644 --- a/plugins/drive-assets/lang/de.json +++ b/plugins/drive-assets/lang/de.json @@ -27,6 +27,8 @@ "Rename": "Umbenennen", "Restore": "Wiederherstellen", "RoleLabel": "Rolle", - "Root": "/" + "Root": "/", + "ForbidCreateDrivePermission": "Laufwerkserstellung verbieten", + "ForbidCreateDrivePermissionDescription": "Verbietet Benutzern die Erstellung neuer Laufwerke" } } diff --git a/plugins/drive-assets/lang/en.json b/plugins/drive-assets/lang/en.json index 917295a9c3..f133053d1c 100644 --- a/plugins/drive-assets/lang/en.json +++ b/plugins/drive-assets/lang/en.json @@ -27,6 +27,8 @@ "Rename": "Rename", "Restore": "Restore", "RoleLabel": "Role", - "Root": "/" + "Root": "/", + "ForbidCreateDrivePermission": "Forbid create drive", + "ForbidCreateDrivePermissionDescription": "Forbid users creating new drives" } } diff --git a/plugins/drive-assets/lang/es.json b/plugins/drive-assets/lang/es.json index c93bd5a2f8..90ae6b12e0 100644 --- a/plugins/drive-assets/lang/es.json +++ b/plugins/drive-assets/lang/es.json @@ -27,6 +27,8 @@ "Rename": "Renombrar", "Restore": "Restaurar", "RoleLabel": "Rol", - "Root": "/" + "Root": "/", + "ForbidCreateDrivePermission": "Prohibir crear unidad", + "ForbidCreateDrivePermissionDescription": "Prohíbe a los usuarios crear nuevas unidades" } -} \ No newline at end of file +} diff --git a/plugins/drive-assets/lang/fr.json b/plugins/drive-assets/lang/fr.json index 4b1a26856d..c7371da1a3 100644 --- a/plugins/drive-assets/lang/fr.json +++ b/plugins/drive-assets/lang/fr.json @@ -27,6 +27,8 @@ "Rename": "Renommer", "Restore": "Restaurer", "RoleLabel": "Rôle", - "Root": "/" + "Root": "/", + "ForbidCreateDrivePermission": "Interdire la création de disque", + "ForbidCreateDrivePermissionDescription": "Interdit aux utilisateurs de créer de nouveaux disques" } -} \ No newline at end of file +} diff --git a/plugins/drive-assets/lang/it.json b/plugins/drive-assets/lang/it.json index 467d74d5b1..389956a36e 100644 --- a/plugins/drive-assets/lang/it.json +++ b/plugins/drive-assets/lang/it.json @@ -27,6 +27,8 @@ "Rename": "Rinomina", "Restore": "Ripristina", "RoleLabel": "Ruolo", - "Root": "/" + "Root": "/", + "ForbidCreateDrivePermission": "Vieta creazione drive", + "ForbidCreateDrivePermissionDescription": "Vieta agli utenti di creare nuovi drive" } } diff --git a/plugins/drive-assets/lang/ja.json b/plugins/drive-assets/lang/ja.json index 83510d5ae0..fbd1f153c9 100644 --- a/plugins/drive-assets/lang/ja.json +++ b/plugins/drive-assets/lang/ja.json @@ -27,6 +27,8 @@ "Rename": "名前を変更", "Restore": "復元", "RoleLabel": "ロール", - "Root": "/" + "Root": "/", + "ForbidCreateDrivePermission": "ドライブの作成禁止", + "ForbidCreateDrivePermissionDescription": "ユーザーが新しいドライブを作成することを禁止します" } } diff --git a/plugins/drive-assets/lang/pt.json b/plugins/drive-assets/lang/pt.json index 0a2039008e..67a2c50835 100644 --- a/plugins/drive-assets/lang/pt.json +++ b/plugins/drive-assets/lang/pt.json @@ -27,6 +27,8 @@ "Rename": "Renomear", "Restore": "Restaurar", "RoleLabel": "Papel", - "Root": "/" + "Root": "/", + "ForbidCreateDrivePermission": "Proibir criação de unidade", + "ForbidCreateDrivePermissionDescription": "Proíbe os utilizadores de criar novas unidades" } -} \ No newline at end of file +} diff --git a/plugins/drive-assets/lang/ru.json b/plugins/drive-assets/lang/ru.json index 5faa793790..e8b1001238 100644 --- a/plugins/drive-assets/lang/ru.json +++ b/plugins/drive-assets/lang/ru.json @@ -27,6 +27,8 @@ "Rename": "Переименовать", "Restore": "Восстановить", "RoleLabel": "Роль", - "Root": "/" + "Root": "/", + "ForbidCreateDrivePermission": "Запретить создание диска", + "ForbidCreateDrivePermissionDescription": "Запрещает пользователям создавать новые диски" } } diff --git a/plugins/drive-assets/lang/tr.json b/plugins/drive-assets/lang/tr.json new file mode 100644 index 0000000000..56d25b72c0 --- /dev/null +++ b/plugins/drive-assets/lang/tr.json @@ -0,0 +1,32 @@ +{ + "string": { + "Drive": "Sürücü", + "Drives": "Sürücüler", + "Grid": "Izgara", + "File": "Dosya", + "Files": "Dosyalar", + "FileVersion": "Dosya sürümü", + "FileVersions": "Dosya sürümleri", + "Folder": "Klasör", + "Folders": "Klasörler", + "Resource": "Kaynak", + "Name": "İsim", + "Description": "Açıklama", + "Parent": "Üst", + "Path": "Yol", + "Version": "Sürüm", + "Size": "Boyut", + "ContentType": "İçerik türü", + "LastModified": "Son Değiştirilme", + "Download": "İndir", + "Upload": "Yükle", + "CreateDrive": "Sürücü Oluştur", + "CreateFolder": "Klasör Oluştur", + "UploadFile": "Dosya Yükle", + "EditDrive": "Sürücüyü Düzenle", + "Rename": "Yeniden adlandır", + "Restore": "Geri yükle", + "RoleLabel": "Rol", + "Root": "/" + } +} diff --git a/plugins/drive-assets/lang/zh.json b/plugins/drive-assets/lang/zh.json index 6309c7cd7a..918b3d4c96 100644 --- a/plugins/drive-assets/lang/zh.json +++ b/plugins/drive-assets/lang/zh.json @@ -27,6 +27,8 @@ "Rename": "重命名", "Restore": "恢复", "RoleLabel": "角色", - "Root": "/" + "Root": "/", + "ForbidCreateDrivePermission": "禁止创建磁盘", + "ForbidCreateDrivePermissionDescription": "禁止用户创建新磁盘" } } diff --git a/plugins/drive-resources/src/components/DriveSpaceHeader.svelte b/plugins/drive-resources/src/components/DriveSpaceHeader.svelte index 6c5f1ea21d..b74ee96630 100644 --- a/plugins/drive-resources/src/components/DriveSpaceHeader.svelte +++ b/plugins/drive-resources/src/components/DriveSpaceHeader.svelte @@ -13,44 +13,66 @@ // limitations under the License. --> -{#if loading} - -{:else} -
- {#if hasDrive} - { - void handleDropdownItemSelected(ev.detail) - }} - /> - {:else} -
-{/if} + diff --git a/plugins/drive/src/plugin.ts b/plugins/drive/src/plugin.ts index 4d52c95798..8b947414fb 100644 --- a/plugins/drive/src/plugin.ts +++ b/plugins/drive/src/plugin.ts @@ -13,7 +13,7 @@ // limitations under the License. // -import type { Class, Doc, Mixin, Ref, SpaceType, SpaceTypeDescriptor, Type } from '@hcengineering/core' +import type { Class, Doc, Mixin, Ref, SpaceType, SpaceTypeDescriptor, Type, Permission } from '@hcengineering/core' import type { Asset, IntlString, Plugin, Resource as PlatformResource } from '@hcengineering/platform' import { plugin } from '@hcengineering/platform' import type { Location, ResolvedLocation } from '@hcengineering/ui/src/types' @@ -64,13 +64,18 @@ export const drivePlugin = plugin(driveId, { File: '' as IntlString, FileVersion: '' as IntlString, Folder: '' as IntlString, - Resource: '' as IntlString + Resource: '' as IntlString, + ForbidCreateDrivePermission: '' as IntlString, + ForbidCreateDrivePermissionDescription: '' as IntlString }, descriptor: { DriveType: '' as Ref }, spaceType: { DefaultDrive: '' as Ref + }, + permission: { + ForbidCreateDrive: '' as Ref } }) diff --git a/plugins/emoji-assets/lang/tr.json b/plugins/emoji-assets/lang/tr.json new file mode 100644 index 0000000000..86b7cae11c --- /dev/null +++ b/plugins/emoji-assets/lang/tr.json @@ -0,0 +1,41 @@ +{ + "string": { + "SmileysAndPeople": "Gül & İnsanlar", + "Components": "Bileşenler", + "AnimalsAndNature": "Hayvanlar & Doğa", + "FoodAndDrink": "Yemek & İçecek", + "TravelAndPlaces": "Seyahat & Yerler", + "Activities": "Aktiviteler", + "Objects": "Nesneler", + "Symbols": "Semboller", + "Flags": "Bayraklar", + "FrequentlyUsed": "Sık kullanılanlar", + "GettingWorkDone": "İşleri halledelim", + "DefaultSkinTone": "Varsayılan ten rengi", + "NoTone": "Ton yok", + "Light": "Açık", + "MediumLight": "Orta-açık", + "Medium": "Orta", + "MediumDark": "Orta-koyu", + "Dark": "Koyu", + "Remove": "Kaldır", + "SearchDots": "Ara...", + "SearchResults": "Arama Sonuçları", + "CustomEmojis": "Özel Emojiler", + "Shortcode": "İsim", + "ShortcodeDescription": "Harf, sayı ve '-', '+', '_' sembollerini içerebilir.", + "Image": "Görsel", + "ImageDescription": "Emojiniz için .gif, .png veya .jpg dosyası belirtin.", + "UploadImage": "Yükle", + "Preview": "Önizleme", + "PreviewTextBegin": "Bu, içinde ", + "PreviewTextEnd": " olan bir cümle.", + "CreateTitle": "Özel Emoji oluştur", + "Create": "Oluştur", + "ImageAspectError": "Görsel 1:1 en-boy oranına sahip olmalıdır.", + "ShortcodeMatchError": "Harf, sayı ve '-', '+', '_' sembollerini içerebilir.", + "ShortcodeExistsError": "Bu isim zaten kullanılıyor. Lütfen başka bir isim seçin.", + "NewCustomEmojiDialogClose": "Bu diyalogu kapatmak istiyor musunuz?", + "NewCustomEmojiDialogCloseNote": "Tüm değişiklikler kaybolacak" + } +} diff --git a/plugins/emoji-resources/src/utils.ts b/plugins/emoji-resources/src/utils.ts index 0cb6984dde..bbb605cc7e 100644 --- a/plugins/emoji-resources/src/utils.ts +++ b/plugins/emoji-resources/src/utils.ts @@ -90,6 +90,13 @@ export function getEmojiByShortCode (shortcode: string | undefined, skinTone?: n }, skinTone) } +export function getEmojiByUnicode (emoji: string): ExtendedEmoji | undefined { + return findEmoji((e) => { + if (isCustomEmoji(e)) return e.shortcode === emoji + return e.emoji === emoji + }) +} + export function getCustomEmoji (shortcode: string | undefined): CustomEmoji | undefined { if (shortcode === undefined) return undefined const pureShortcode = shortcode.replaceAll(':', '') diff --git a/plugins/export-assets/lang/tr.json b/plugins/export-assets/lang/tr.json new file mode 100644 index 0000000000..3975b05a9d --- /dev/null +++ b/plugins/export-assets/lang/tr.json @@ -0,0 +1,26 @@ +{ + "string": { + "WorkspaceNamePattern": "İsim 40 karakter veya daha kısa, boş olmamalı ve özel karakterler (<, >, /) içermemelidir", + "Export": "Dışa Aktar", + "DataToExport": "Dışa aktarılacak veri", + "ExportDocuments": "Dokümanlar", + "ExportMilestones": "Kilometre Taşı", + "ExportIssues": "Sorunlar", + "ExportTestCases": "Test Senaryoları", + "ExportTestRuns": "Test Çalıştırmaları", + "ExportTestPlans": "Test Planları", + "ExportFormat": "Dışa aktarma formatı", + "ExportJSON": "JSON", + "ExportCSV": "CSV", + "ExportUnifiedFormat": "Huly Birleşik Format", + "ExportIncludeContent": "İçerik dahil et", + "ExportEverything": "Her şey", + "ExportAttributesOnly": "Sadece öznitelikler", + "ExportRequestSuccess": "Dışa aktarma başladı.", + "ExportRequestSuccessMessage": "Dışa aktarma başladı. Tamamlandığında Gelen Kutunuzda bir bildirim alacaksınız.", + "ExportRequestFailed": "Dışa aktarma gönderilemedi.", + "ExportRequestFailedMessage": "Dışa aktarma gönderirken hata oluştu. Lütfen daha sonra tekrar deneyin.", + "ExportCompleted": "Dışa aktarma tamamlandı. Dosyalarınız hazır. Bunları sürücüden indirebilirsiniz.", + "ExportFailed": "Veri dışa aktarılamadı. Lütfen daha sonra tekrar deneyin." + } +} diff --git a/plugins/gmail-assets/lang/tr.json b/plugins/gmail-assets/lang/tr.json new file mode 100644 index 0000000000..ce68710ebd --- /dev/null +++ b/plugins/gmail-assets/lang/tr.json @@ -0,0 +1,50 @@ +{ + "string": { + "MessageID": "MesajID", + "IntegrationLabel": "Gmail", + "IntegrationDescription": "E-posta göndermek, almak ve yönetmek için Gmail hesabınızı bağlayın", + "SharedMessages": "paylaşılan e-postalar", + "To": "Kime:", + "From": "Kimden:", + "Copy": "Kopya", + "MessagesSelected": "mesaj seçildi", + "PublishSelected": "Seçilenleri yayınla", + "CreateMessage": "Mesaj oluştur", + "ShareMessages": "Mesajları paylaş", + "Connect": "Bağlan", + "RedirectGoogle": "Google kimlik doğrulama sayfasına yönlendirileceksiniz. Lütfen tüm izinleri seçtiğinizden emin olun.", + "ConnectGmail": "Gmail hesabını bağla", + "Reply": "Yanıtla", + "Subject": "Konu", + "Send": "Gönder", + "Resend": "Yeniden gönder", + "NewMessage": "Yeni mesaj", + "NewMessageTo": "Yeni mesaj:", + "Cancel": "İptal", + "SubjectPlaceholder": "Mesaj konusu", + "CopyPlaceholder": "Kopya:", + "ReplyTo": "Yanıtla:", + "Message": "Mesaj", + "Messages": "Mesajlar", + "Incoming": "Gelen", + "Email": "E-posta", + "Status": "Durum", + "EmailPlaceholder": "ahmet.yilmaz@ornek.com", + "WriteEmail": "E-posta Yaz", + "Shared": "Paylaşıldı", + "AvailableTo": "Uygun:", + "HaveWrittenEmail": "bir e-posta yazdı", + "NewIncomingMessage": "Size yeni bir e-posta gönderdi", + "ConfigLabel": "E-posta", + "ConfigDescription": "Gmail e-posta entegrasyonu için uzantı", + "GooglePrivacy": "Huly'nin Google API'lerinden aldığı bilgilerin kullanımı ve diğer uygulamalara aktarımı, Sınırlı Kullanım gereksinimleri dahil olmak üzere Google API Hizmetleri Kullanıcı Verileri Politikası'na uyacaktır.", + "EmailNotificationsDescription": "E-posta üzerinden kişisel bildirimler alın.", + "FailedToConnect": "Gmail servisi kullanılamıyor", + "TotalMessages": "Toplam mesaj:", + "Configure": "Gmail entegrasyonunu yapılandır", + "GmailSpace": "Mesaj kanalı için alan", + "PersonSpaceInfo": "E-posta size açık olacak", + "SharedSpaceInfo": "E-posta tüm alan katılımcılarına açık olacak", + "ConfigurationRequired": "Kullanmaya başlamak için lütfen Gmail entegrasyonunuzu yapılandırın" + } +} diff --git a/plugins/guest-assets/lang/tr.json b/plugins/guest-assets/lang/tr.json new file mode 100644 index 0000000000..a8e0efabe0 --- /dev/null +++ b/plugins/guest-assets/lang/tr.json @@ -0,0 +1,10 @@ +{ + "string": { + "CreatePublicLink": "Genel bağlantı oluştur", + "PublicLink": "Genel bağlantı", + "Revoke": "İptal et", + "RevokeConfirmation": "Bu, önceden paylaşılan bağlantının çalışmayı durdurmasına neden olur. Bu genel bağlantıyı iptal etmek istediğinizden emin misiniz?", + "LinkWasRevoked": "Genel bağlantı iptal edildi", + "Copy": "Kopyala" + } +} diff --git a/plugins/guest-resources/src/connect.ts b/plugins/guest-resources/src/connect.ts index b0b1aa6f19..6486ee48e9 100644 --- a/plugins/guest-resources/src/connect.ts +++ b/plugins/guest-resources/src/connect.ts @@ -18,6 +18,7 @@ import presentation, { loadServerConfig, refreshClient, setClient, + setCommunicationClient, setPresentationCookie, upgradeDownloadProgress } from '@hcengineering/presentation' @@ -245,6 +246,7 @@ export async function connect (title: string): Promise { document.title = [wsUrl, title].filter((it) => it).join(' - ') _clientSet = true await setClient(_client) + await setCommunicationClient(_client) return _client } diff --git a/plugins/hr-assets/lang/tr.json b/plugins/hr-assets/lang/tr.json new file mode 100644 index 0000000000..fa06e25121 --- /dev/null +++ b/plugins/hr-assets/lang/tr.json @@ -0,0 +1,69 @@ +{ + "string": { + "Department": "Departman", + "ParentDepartmentLabel": "Üst departman", + "Structure": "Yapı", + "CreateDepartment": "Departman oluştur", + "CreateDepartmentLabel": "Departman", + "DepartmentPlaceholder": "Departman", + "TeamLead": "Takım lideri", + "UnAssignLead": "Takım liderini kaldır", + "MemberCount": "{count, plural, =0 {çalışan yok} =1 {1 çalışan} other {# çalışan}}", + "AssignLead": "Takım lideri ata", + "TeamLeadTooltip": "{value}", + "HRApplication": "İnsan kaynakları (beta)", + "MoveStaff": "Çalışan transferi", + "MoveStaffDescr": "Çalışanı {current}'ten {department}'e transfer etmek istiyor musunuz?", + "Departments": "Departmanlar", + "Positions": "Pozisyonlar", + "ShowEmployees": "Çalışanları göster", + "AddEmployee": "Çalışan ekle", + "SelectEmployee": "Çalışan seç", + "Schedule": "Program", + "RequestType": "Tip", + "CreateRequest": "{type} oluştur", + "Today": "Bugün", + "Summary": "Toplam", + "NoEmployeesInDepartment": "Seçilen departmanda çalışan yok", + "Vacation": "Tatil", + "Sick": "Hastalık", + "PTO": "İzin", + "PTOs": "İzinler", + "Remote": "Uzaktan", + "Overtime": "Fazla mesai", + "PTO2": "İzin/2", + "Overtime2": "Fazla mesai/2", + "EditRequest": "{type} düzenle", + "EditRequestType": "Tip düzenle", + "ChooseNewType": "Yeni tip seç:", + "UnchangeableType": "Bu tip değiştirilemez", + "Request": "Talep", + "ExistingRequests": "Belirlenen tarihler için zaten mevcut talepler var", + "Staff": "Çalışan", + "Member": "Üye", + "Members": "Üyeler", + "NoMembers": "Üye eklenmedi", + "AddMember": "Üye ekle", + "Subscribers": "Aboneler", + "PublicHoliday": "Resmi tatil", + "Title": "Başlık", + "Description": "Açıklama", + "PublicHolidays": "Resmi tatiller", + "MarkAsPublicHoliday": "Resmi tatil olarak işaretle", + "EditPublicHoliday": "Resmi tatili düzenle", + "Managers": "Yöneticiler", + "Export": "Dışa aktar", + "Separator": "Ayırıcı", + "ChooseSeparator": "Ayırıcı seç", + "RequestCreated": "Talep oluşturuldu", + "RequestUpdated": "Talep güncellendi", + "RequestRemoved": "Talep kaldırıldı", + "ConfigLabel": "İnsan kaynakları", + "ConfigDescription": "Organizasyon yapısını ve çalışan iş takvimini yönetmek için uzantı", + "WorkingDays": "Çalışma günleri", + "ReportedDays": "Raporlanan günler", + "Tasks": "Görevler", + "TPD": "TPD", + "EXTRa": "EXTRa" + } +} diff --git a/plugins/huly-mail-assets/lang/tr.json b/plugins/huly-mail-assets/lang/tr.json new file mode 100644 index 0000000000..50ced94f6e --- /dev/null +++ b/plugins/huly-mail-assets/lang/tr.json @@ -0,0 +1,20 @@ +{ + "string": { + "IntegrationLabel": "Huly Mail", + "IntegrationDescription": "E-posta göndermek, almak ve yönetmek için Huly posta kutunuzu bağlayın", + "Connect": "Bağlan", + "ConnectHulyMail": "Huly posta kutusunu bağla", + "Cancel": "İptal", + "Email": "E-posta", + "Status": "Durum", + "FailedToConnect": "Huly mail servisi kullanılamıyor", + "TotalMessages": "Toplam mesaj:", + "Configure": "Huly mail'i yapılandır", + "ChannelSpace": "Mesaj kanalı için alan", + "PersonSpaceInfo": "E-posta size açık olacak", + "SharedSpaceInfo": "E-posta tüm alan katılımcılarına açık olacak", + "Mailbox": "Posta kutusu", + "MailboxesNotConfigured": "Posta kutusu bulunamadı", + "ConfigureMailBoxes": "Başlamak için lütfen `Posta Kutuları` bölümünden bir posta kutusu ekleyin" + } +} diff --git a/plugins/inventory-assets/lang/tr.json b/plugins/inventory-assets/lang/tr.json new file mode 100644 index 0000000000..761d7c79bc --- /dev/null +++ b/plugins/inventory-assets/lang/tr.json @@ -0,0 +1,25 @@ +{ + "status": { + "CategoryRequired": "Kategori gerekli", + "NameRequired": "İsim gerekli" + }, + "string": { + "Categories": "Kategoriler", + "Category": "Kategori", + "CategoryCreateLabel": "Kategori", + "CreateCategory": "Kategori oluştur", + "CreateSubcategory": "Alt kategori oluştur", + "Inventory": "Envanter", + "ProductCreateLabel": "Ürün", + "CreateProduct": "Ürün oluştur", + "Products": "Ürünler", + "Product": "Ürün", + "Variant": "Varyant", + "SKU": "SKU", + "Variants": "Varyantlar", + "NoVariantsForProduct": "Bu ürün için varyant yok.", + "CreateVariant": "Varyant oluştur", + "ConfigLabel": "Envanter", + "ConfigDescription": "Envanteri yönetmek için uzantı" + } +} diff --git a/plugins/lead-assets/lang/cs.json b/plugins/lead-assets/lang/cs.json index c10e659aac..d0ce8ce5bf 100644 --- a/plugins/lead-assets/lang/cs.json +++ b/plugins/lead-assets/lang/cs.json @@ -34,6 +34,8 @@ "ConfigDescription": "Rozšíření pro řízení vztahů se zákazníky", "EditFunnel": "Upravit trychtýř", "FunnelMembers": "Členové", - "RoleLabel": "Role: {role}" + "RoleLabel": "Role: {role}", + "ForbidCreateFunnelPermission": "Zakázat vytvoření trychtýře", + "ForbidCreateFunnelPermissionDescription": "Zakazuje uživatelům vytvářet nové trychtýře" } -} \ No newline at end of file +} diff --git a/plugins/lead-assets/lang/de.json b/plugins/lead-assets/lang/de.json index 3194f49797..c6dbe8e78c 100644 --- a/plugins/lead-assets/lang/de.json +++ b/plugins/lead-assets/lang/de.json @@ -34,6 +34,8 @@ "ConfigDescription": "Erweiterung für Customer Relationship Management", "EditFunnel": "Trichter bearbeiten", "FunnelMembers": "Mitglieder", - "RoleLabel": "Rolle: {role}" + "RoleLabel": "Rolle: {role}", + "ForbidCreateFunnelPermission": "Trichtererstellung verbieten", + "ForbidCreateFunnelPermissionDescription": "Verbietet Benutzern das Erstellen neuer Trichter" } -} \ No newline at end of file +} diff --git a/plugins/lead-assets/lang/en.json b/plugins/lead-assets/lang/en.json index 7ac2240eef..7d19d293e3 100644 --- a/plugins/lead-assets/lang/en.json +++ b/plugins/lead-assets/lang/en.json @@ -34,6 +34,8 @@ "ConfigDescription": "Extension for Customer relation management", "EditFunnel": "Edit Funnel", "FunnelMembers": "Members", - "RoleLabel": "Role: {role}" + "RoleLabel": "Role: {role}", + "ForbidCreateFunnelPermission": "Forbid create funnel", + "ForbidCreateFunnelPermissionDescription": "Forbid users creating new funnels" } -} \ No newline at end of file +} diff --git a/plugins/lead-assets/lang/es.json b/plugins/lead-assets/lang/es.json index 84def00cdd..bfb10563b5 100644 --- a/plugins/lead-assets/lang/es.json +++ b/plugins/lead-assets/lang/es.json @@ -34,6 +34,8 @@ "ConfigDescription": "Extensión para la gestión de las relaciones con los Clientes", "EditFunnel": "Editar Embudo", "FunnelMembers": "Miembros", - "RoleLabel": "Role: {role}" + "RoleLabel": "Role: {role}", + "ForbidCreateFunnelPermission": "Prohibir crear embudo", + "ForbidCreateFunnelPermissionDescription": "Prohíbe a los usuarios crear nuevos embudos" } -} \ No newline at end of file +} diff --git a/plugins/lead-assets/lang/fr.json b/plugins/lead-assets/lang/fr.json index a5d4b1c5a8..d671cd71eb 100644 --- a/plugins/lead-assets/lang/fr.json +++ b/plugins/lead-assets/lang/fr.json @@ -34,6 +34,8 @@ "ConfigDescription": "Extension pour la gestion de la relation client", "EditFunnel": "Modifier le pipeline", "FunnelMembers": "Membres", - "RoleLabel": "Rôle : {role}" + "RoleLabel": "Rôle : {role}", + "ForbidCreateFunnelPermission": "Interdire la création de pipeline", + "ForbidCreateFunnelPermissionDescription": "Interdit aux utilisateurs de créer de nouveaux pipelines" } -} \ No newline at end of file +} diff --git a/plugins/lead-assets/lang/it.json b/plugins/lead-assets/lang/it.json index 53663f939c..f26445d7c6 100644 --- a/plugins/lead-assets/lang/it.json +++ b/plugins/lead-assets/lang/it.json @@ -34,6 +34,8 @@ "ConfigDescription": "Estensione per la gestione delle relazioni con i clienti", "EditFunnel": "Modifica Funnel", "FunnelMembers": "Membri", - "RoleLabel": "Ruolo: {role}" + "RoleLabel": "Ruolo: {role}", + "ForbidCreateFunnelPermission": "Vieta creazione funnel", + "ForbidCreateFunnelPermissionDescription": "Vieta agli utenti di creare nuovi funnel" } } diff --git a/plugins/lead-assets/lang/ja.json b/plugins/lead-assets/lang/ja.json index 1fd0a9ac58..f1ffd52f39 100644 --- a/plugins/lead-assets/lang/ja.json +++ b/plugins/lead-assets/lang/ja.json @@ -34,6 +34,8 @@ "ConfigDescription": "顧客関係管理のための拡張機能", "EditFunnel": "ファネルを編集", "FunnelMembers": "メンバー", - "RoleLabel": "ロール: {role}" + "RoleLabel": "ロール: {role}", + "ForbidCreateFunnelPermission": "ファネルの作成禁止", + "ForbidCreateFunnelPermissionDescription": "ユーザーが新しいファネルを作成することを禁止します" } } diff --git a/plugins/lead-assets/lang/pt.json b/plugins/lead-assets/lang/pt.json index eefb7bd95d..c566c8990f 100644 --- a/plugins/lead-assets/lang/pt.json +++ b/plugins/lead-assets/lang/pt.json @@ -34,6 +34,8 @@ "ConfigDescription": "Extensão para gestão de relacionamento com o Cliente", "EditFunnel": "Editar Funil", "FunnelMembers": "Membros", - "RoleLabel": "Cargo: {role}" + "RoleLabel": "Cargo: {role}", + "ForbidCreateFunnelPermission": "Proibir criação de funil", + "ForbidCreateFunnelPermissionDescription": "Proíbe os utilizadores de criar novos funis" } -} \ No newline at end of file +} diff --git a/plugins/lead-assets/lang/ru.json b/plugins/lead-assets/lang/ru.json index f3faa9f8c2..9ce22bc69f 100644 --- a/plugins/lead-assets/lang/ru.json +++ b/plugins/lead-assets/lang/ru.json @@ -34,6 +34,8 @@ "ConfigDescription": "Расширение по работе с клиентами", "EditFunnel": "Редактировать воронку", "FunnelMembers": "Участники", - "RoleLabel": "Роль: {role}" + "RoleLabel": "Роль: {role}", + "ForbidCreateFunnelPermission": "Запретить создание воронки", + "ForbidCreateFunnelPermissionDescription": "Запрещает пользователям создавать новые воронки" } -} \ No newline at end of file +} diff --git a/plugins/lead-assets/lang/tr.json b/plugins/lead-assets/lang/tr.json new file mode 100644 index 0000000000..7c60546fce --- /dev/null +++ b/plugins/lead-assets/lang/tr.json @@ -0,0 +1,39 @@ +{ + "string": { + "CreateFunnel": "Yeni Huni", + "CreateLead": "Yeni Aday", + "Funnel": "Huni", + "FunnelName": "Huni adı", + "Funnels": "Huniler", + "LeadApplication": "Adaylar (beta)", + "LeadCreateLabel": "Aday", + "SelectFunnel": "Huni seç", + "LeadName": "Aday adı", + "More": "Daha fazla...", + "Customer": "Müşteri", + "Customers": "Müşteriler", + "Leads": "Adaylar", + "MyLeads": "Adaylarım", + "SelectCustomer": "Müşteri seç", + "Lead": "Aday", + "Assignee": "Atanan", + "Title": "Başlık", + "LeadPlaceholder": "Basit aday", + "ManageFunnelStatuses": "Huni tiplerini yönet", + "GotoLeadApplication": "Aday Uygulamasına geç", + "IssueDescriptionPlaceholder": "Açıklama ekle...", + "CreateCustomer": "Müşteri Oluştur", + "CreateCustomerLabel": "Yeni Müşteri", + "NoLeadsForDocument": "Doküman için aday yok", + "Description": "Müşteri Açıklaması", + "FullDescription": "Tam açıklama", + "FunnelPlaceholder": "Basit huni", + "Members": "Üyeler", + "UnAssign": "Atamayı kaldır", + "ConfigLabel": "CRM", + "ConfigDescription": "Müşteri ilişkiler yönetimi için uzantı", + "EditFunnel": "Huniyi Düzenle", + "FunnelMembers": "Üyeler", + "RoleLabel": "Rol: {role}" + } +} diff --git a/plugins/lead-assets/lang/zh.json b/plugins/lead-assets/lang/zh.json index 49ad99732f..f06ca306a4 100644 --- a/plugins/lead-assets/lang/zh.json +++ b/plugins/lead-assets/lang/zh.json @@ -34,6 +34,8 @@ "ConfigDescription": "用于客户关系管理的扩展", "EditFunnel": "编辑漏斗", "FunnelMembers": "成员", - "RoleLabel": "角色：{role}" + "RoleLabel": "角色：{role}", + "ForbidCreateFunnelPermission": "禁止创建漏斗", + "ForbidCreateFunnelPermissionDescription": "禁止用户创建新漏斗" } } diff --git a/plugins/lead-resources/src/components/NewItemsHeader.svelte b/plugins/lead-resources/src/components/NewItemsHeader.svelte index 8647565e7f..3b9354347e 100644 --- a/plugins/lead-resources/src/components/NewItemsHeader.svelte +++ b/plugins/lead-resources/src/components/NewItemsHeader.svelte @@ -13,23 +13,29 @@ // limitations under the License. --> -
-
+ diff --git a/plugins/lead/src/index.ts b/plugins/lead/src/index.ts index f30be8eb82..bf4579ac9b 100644 --- a/plugins/lead/src/index.ts +++ b/plugins/lead/src/index.ts @@ -15,7 +15,17 @@ // import type { Contact } from '@hcengineering/contact' -import type { Attribute, Class, MarkupBlobRef, Doc, Markup, Ref, Status, Timestamp } from '@hcengineering/core' +import type { + Attribute, + Class, + MarkupBlobRef, + Doc, + Markup, + Ref, + Status, + Timestamp, + Permission +} from '@hcengineering/core' import { Mixin } from '@hcengineering/core' import type { Asset, IntlString, Plugin } from '@hcengineering/platform' import { plugin } from '@hcengineering/platform' @@ -73,7 +83,9 @@ const lead = plugin(leadId, { }, string: { Lead: '' as IntlString, - ConfigLabel: '' as IntlString + ConfigLabel: '' as IntlString, + ForbidCreateFunnelPermission: '' as IntlString, + ForbidCreateFunnelPermissionDescription: '' as IntlString }, attribute: { State: '' as Ref> @@ -96,6 +108,9 @@ const lead = plugin(leadId, { }, space: { DefaultFunnel: '' as Ref + }, + permission: { + ForbidCreateFunnel: '' as Ref } }) diff --git a/plugins/login-assets/lang/tr.json b/plugins/login-assets/lang/tr.json new file mode 100644 index 0000000000..686da96958 --- /dev/null +++ b/plugins/login-assets/lang/tr.json @@ -0,0 +1,81 @@ +{ + "status": { + "RequiredField": "Gerekli alan {field}", + "FieldsDoNotMatch": "{field}, {field2} ile eşleşmiyor", + "ConnectingToServer": "Sunucuya bağlanılıyor....", + "IncorrectValue": "Yanlış değer {field}" + }, + "string": { + "LogIn": "Giriş Yap", + "SignUp": "Kayıt Ol", + "CreateWorkspace": "Çalışma alanı oluştur", + "HaveWorkspace": "Zaten bir çalışma alanınız var mı?", + "LastName": "Soyad", + "FirstName": "Ad", + "Join": "Katıl", + "Email": "E-posta", + "Password": "Şifre", + "Workspace": "Çalışma alanı adı", + "DoNotHaveAnAccount": "Hesabınız yok mu?", + "PasswordRepeat": "Şifreyi tekrarla", + "HaveAccount": "Zaten hesabınız var mı?", + "LoadingAccount": "Yükleniyor...", + "SelectWorkspace": "Çalışma alanı seç", + "Copy": "Kopyala", + "Copied": "Kopyalandı", + "Close": "Kapat", + "InviteDescription": "Diğer kullanıcıları davet etmek için bu bağlantıyı paylaşın", + "WantAnotherWorkspace": "Başka bir çalışma alanı oluşturmak ister misiniz?", + "ChangeAccount": "Hesabı değiştir", + "NotSeeingWorkspace": "Çalışma alanınızı görmüyor musunuz?", + "ForgotPassword": "Şifrenizi mi unuttunuz?", + "KnowPassword": "Şifrenizi biliyor musunuz?", + "Recover": "Kurtar", + "PasswordRecovery": "Şifre kurtarma", + "RecoveryLinkSent": "Şifre kurtarma bağlantısı e-postaya gönderildi", + "UseWorkspaceInviteSettings": "Çalışma alanı davet ayarlarını kullan", + "LinkValidHours": "Bağlantı geçerlilik süresi (saat):", + "EmailMask": "E-posta maskesi:", + "InviteLimit": "Davet limiti:", + "GetLink": "Davet bağlantısı al", + "NoLimit": "Limit yok", + "AlreadyJoined": "Zaten katıldınız mı?", + "ConfirmationSent": "Adresinizi onaylamak için bir bağlantı içeren mesaj e-postanıza gönderildi.", + "ConfirmationSent2": "Kaydınızı tamamlamak için lütfen bağlantıya tıklayın.", + "ContinueWith": "{provider} ile devam et", + "HaventReceivedCode": "Kodu almadınız mı?", + "ResendCode": "Kodu yeniden gönder", + "WrongEmail": "Yanlış e-posta?", + "ChangeEmail": "E-postayı değiştir", + "SentTo": "Bir kod gönderdik: ", + "CanFindCode": "Kodunuzu bulamıyor musunuz? Spam klasörünüze bakın.", + "LoginWithPassword": "Şifre ile giriş yap", + "LoginWithCode": "Kod ile giriş yap", + "SignUpWithPassword": "Şifre ile kayıt ol", + "SignUpWithCode": "Kod ile kayıt ol", + "FillInProfile": "Profilinizi doldurun", + "SetUpPassword": "Şifrenizi ayarlayın", + "Next": "İleri", + "Skip": "Atla", + "SignUpCompleted": "Kayıt tamamlandı", + "StartUsingHuly": "Huly'yi kullanmaya başla", + "PasswordMinLength": "{count, plural, =1 {Şifre en az # karakter uzunluğunda olmalı} other {Şifre en az # karakter uzunluğunda olmalı}}", + "PasswordMinSpecialChars": "{count, plural, =1 {Şifre en az # özel karakter içermeli} other {Şifre en az # özel karakter içermeli}}", + "PasswordMinDigits": "{count, plural, =1 {Şifre en az # rakam içermeli} other {Şifre en az # rakam içermeli}}", + "PasswordMinUpperChars": "{count, plural, =1 {Şifre en az # büyük harf içermeli} other {Şifre en az # büyük harf içermeli}}", + "PasswordMinLowerChars": "{count, plural, =1 {Şifre en az # küçük harf içermeli} other {Şifre en az # küçük harf içermeli}}", + "WorkspaceArchivedDesc": "Çalışma alanı kullanılmadığı için arşivlendi.", + "RestoreArchivedWorkspace": "Arşivden çıkar", + "Hello": "Merhaba {name},", + "ProcessingInvite": "Davet işleniyor, lütfen bekleyin...", + "SignToProceed": "Devam etmek için lütfen giriş yapın", + "Proceed": "Devam et", + "SetPasswordLater": "Şifreyi daha sonra ayarlayacağım", + "SetPasswordNow": "Şifreyi şimdi ayarlayacağım", + "LoginAsGuest": "Misafir olarak devam et", + "SignUpToCreateWorkspace": "Misafir erişimi olan çalışma alanı yok. Kendi alanınızı oluşturmak için lütfen kayıt olun.", + "WhatIsYourName": "Adınız nedir?", + "AccessExpired": "Erişim süresi doldu. Lütfen yeni bir erişim bağlantısı isteyin.", + "AccessNotActive": "Erişim süresi henüz başlamadı. Başlangıç zamanı: " + } +} diff --git a/plugins/love-assets/assets/icons.svg b/plugins/love-assets/assets/icons.svg index 8d16937101..798e12b651 100644 --- a/plugins/love-assets/assets/icons.svg +++ b/plugins/love-assets/assets/icons.svg @@ -82,10 +82,8 @@ - - - - + + diff --git a/plugins/love-assets/lang/tr.json b/plugins/love-assets/lang/tr.json new file mode 100644 index 0000000000..8ff0d86972 --- /dev/null +++ b/plugins/love-assets/lang/tr.json @@ -0,0 +1,98 @@ +{ + "string": { + "Office": "Ofis", + "Room": "Oda", + "RoomType": "Oda tipi", + "Share": "Paylaş", + "StopShare": "Paylaşmayı durdur", + "StartVideo": "Videoyu başlat", + "StopVideo": "Videoyu durdur", + "Mute": "Sessize al", + "UnMute": "Sesi aç", + "LeaveRoom": "Odadan ayrıl", + "Floors": "Katlar", + "MyOffice": "Ofisim", + "EditOffice": "Ofisi düzenle", + "FinalizeEditing": "Tamam", + "Floor": "Kat", + "ChangeFloor": "Kat değiştir", + "IsKnocking": "{name} kapıyı çalıyor...", + "Accept": "Kabul et", + "Decline": "Reddet", + "EnterRoom": "Odaya gir", + "TeamRoom": "Takım odası", + "MeetingRoom": "Toplantı odası", + "KnockingTo": "Kapı çalınıyor: ...", + "Cancel": "İptal", + "AnotherWindowError": "Başka bir pencerede zaten bağlantı kurulmuş. Lütfen o pencereyi kullanın veya yeniden bağlanın", + "Speaker": "Hoparlör", + "Microphone": "Mikrofon", + "Camera": "Kamera", + "Settings": "Ayarlar", + "LoveDescription": "Canlı Ofis Sanal Ortam", + "DefaultDevice": "Varsayılan cihaz", + "Knock": "Kapı çalma gerekli", + "Open": "Açık", + "DND": "Rahatsız etmeyin", + "ChangeAccess": "Erişimi değiştir", + "AddAFloor": "Kat ekle", + "RenameAFloor": "Katı yeniden adlandır", + "StartWithoutVideo": "Her zaman kamera kapalı başlat", + "StartWithMutedMic": "Her zaman mikrofon kapalı başlat", + "InvitingYou": "{name} sizi katılmaya davet ediyor", + "YouInivite": "Katılmaya davet ediyorsunuz", + "NoiseCancellation": "Gürültü engelleme", + "KnockingLabel": "Kapı çalma", + "InivitingLabel": "Davet", + "Invite": "Davet et", + "KnockAction": "Kapıyı çal", + "NoiseCancellationNotSupported": "Gürültü engelleme bu tarayıcıda desteklenmiyor", + "Blur": "Arka plan bulanıklaştırma", + "BlurRadius": "Yarıçap", + "BlurTooltip": "Bulanıklaştırma özelliği CPU tüketimini önemli ölçüde artırır, bu da genel sistem performansını etkileyebilir.", + "GuestLink": "Misafir bağlantısı", + "CopyGuestLink": "Misafir bağlantısını kopyala", + "Record": "Kaydet", + "StopRecord": "Kaydı durdur", + "LeaveRoomConfirmation": "Odadan ayrılmak istediğinizden emin misiniz?", + "ServiceNotConfigured": "Servis yapılandırılmamış", + "FullscreenMode": "Tam ekran modu", + "ExitingFullscreenMode": "Tam ekran modundan çıkılıyor", + "Select": "Seç", + "ChooseShare": "Paylaşılacak şeyi seç", + "CreateMeeting": "Toplantı oluştur", + "MoreOptions": "Daha fazla seçenek", + "StartTranscription": "Transkripti başlat", + "StopTranscription": "Transkripti durdur", + "Meeting": "Toplantı", + "Transcription": "Transkript", + "StartWithTranscription": "Transkript ile başlat", + "MeetingMinutes": "Toplantı tutanağı", + "MeetingsMinutes": "Toplantı tutanakları", + "StartMeeting": "Toplantıyı başlat", + "Video": "Video", + "NoMeetingMinutes": "Toplantı tutanağı yok", + "JoinMeeting": "Toplantıya katıl", + "MeetingStart": "Toplantı başlangıcı", + "MeetingEnd": "Toplantı bitişi", + "EndMeeting": "Toplantıyı bitir", + "Status": "Durum", + "Active": "Aktif", + "Finished": "Bitti", + "StartWithRecording": "Kayıt ile başlat", + "Language": "Dil", + "Kick": "Çıkar", + "WithAudio": "Sistem sesini dahil et", + "ShareWithAudioTooltip": "Ekranınızı sistem sesi ile paylaşın. Değişiklikleri uygulamak için ekran paylaşımını yeniden başlatın.", + "MicPermission": "Mikrofon bulunamadı, tarayıcı izinlerini kontrol edin", + "CamPermission": "Kamera bulunamadı, tarayıcı izinlerini kontrol edin", + "SearchMeetingMinutes": "Toplantı tutanağı ara...", + "Sharing": "Paylaşılıyor...", + "Browser": "Tarayıcı", + "Monitor": "Monitör", + "Window": "Pencere", + "MeetingEmptyTitle": "Toplantı bitti mi?", + "MeetingEmptyMessage": "Tüm katılımcılar ayrıldı. 1 dakika içinde bağlantınız kesilecek. Kalmak ister misiniz?", + "StayInRoom": "Odada kal" + } +} diff --git a/plugins/love-resources/package.json b/plugins/love-resources/package.json index 99783a4f51..a2782eea1e 100644 --- a/plugins/love-resources/package.json +++ b/plugins/love-resources/package.json @@ -64,6 +64,7 @@ "@hcengineering/emoji": "^0.6.0", "@hcengineering/emoji-resources": "^0.6.0", "@hcengineering/theme": "^0.6.5", + "@hcengineering/account-client": "^0.6.0", "@livekit/krisp-noise-filter": "^0.3.0", "@livekit/track-processors": "^0.5.6", "livekit-client": "^2.15.6", diff --git a/plugins/love-resources/src/components/EditRoom.svelte b/plugins/love-resources/src/components/EditRoom.svelte index b5a941e7e0..e079c67960 100644 --- a/plugins/love-resources/src/components/EditRoom.svelte +++ b/plugins/love-resources/src/components/EditRoom.svelte @@ -19,9 +19,10 @@ import { IntlString } from '@hcengineering/platform' import love from '../plugin' - import { getRoomName, tryConnect } from '../utils' - import { infos, invites, myInfo, myRequests, selectedRoomPlace, myOffice, currentRoom } from '../stores' + import { getRoomName } from '../utils' + import { infos, myOffice, currentRoom } from '../stores' import { lkSessionConnected } from '../liveKitClient' + import { createMeeting, joinMeeting } from '../meetings' export let object: Room @@ -38,21 +39,14 @@ dispatch('open', { ignoreKeys: ['name'] }) }) - let tryConnecting = false + const tryConnecting = false async function connect (): Promise { - tryConnecting = true - const place = $selectedRoomPlace - await tryConnect( - $myInfo, - object, - $infos, - $myRequests, - $invites, - place?._id === object._id ? { x: place.x, y: place.y } : undefined - ) - tryConnecting = false - selectedRoomPlace.set(undefined) + if ($infos.some(({ room }) => room === object._id)) { + await joinMeeting(object) + } else { + await createMeeting(object) + } } $: connecting = tryConnecting || ($currentRoom?._id === object._id && !$lkSessionConnected) diff --git a/plugins/love-resources/src/components/Hall.svelte b/plugins/love-resources/src/components/Hall.svelte index 88437afec3..b57f95339e 100644 --- a/plugins/love-resources/src/components/Hall.svelte +++ b/plugins/love-resources/src/components/Hall.svelte @@ -15,22 +15,10 @@
diff --git a/plugins/love-resources/src/components/Main.svelte b/plugins/love-resources/src/components/Main.svelte index 27d7e6703b..ae87fec615 100644 --- a/plugins/love-resources/src/components/Main.svelte +++ b/plugins/love-resources/src/components/Main.svelte @@ -14,15 +14,8 @@ -->
diff --git a/plugins/love-resources/src/components/MediaPopupItemExt.svelte b/plugins/love-resources/src/components/MediaPopupItemExt.svelte index fe7d6c0cd9..a02a2119c6 100644 --- a/plugins/love-resources/src/components/MediaPopupItemExt.svelte +++ b/plugins/love-resources/src/components/MediaPopupItemExt.svelte @@ -1,14 +1,14 @@
@@ -22,7 +20,7 @@ label={love.string.Kick} icon={love.icon.Kick} action={() => { - kick(person, $rooms, $infos) + void kick(person) }} /> {/if} @@ -32,7 +30,7 @@ label={love.string.Invite} icon={love.icon.Invite} action={() => { - invite(person, $myInfo?.room) + void sendInvites([person]) }} /> {#if room.access === RoomAccess.Knock} @@ -41,7 +39,7 @@ label={love.string.KnockAction} icon={love.icon.Knock} action={() => { - tryConnect($myInfo, room, info, $myRequests, $invites) + void joinMeeting(room) }} /> {/if} diff --git a/plugins/love-resources/src/components/Room.svelte b/plugins/love-resources/src/components/Room.svelte index a1c769a54e..ff7c0bff19 100644 --- a/plugins/love-resources/src/components/Room.svelte +++ b/plugins/love-resources/src/components/Room.svelte @@ -13,21 +13,19 @@ // limitations under the License. -->
@@ -11,8 +12,8 @@ on={$isShareWithSound} on:change={(e) => { $isShareWithSound = e.detail - if ($isSharingEnabled) { - void liveKitClient.setScreenShareEnabled($isSharingEnabled, e.detail) + if ($screenSharingState === ScreenSharingState.Local) { + void liveKitClient.setScreenShareEnabled(true, e.detail) } }} /> diff --git a/plugins/love-resources/src/components/SharingStateIndicator.svelte b/plugins/love-resources/src/components/SharingStateIndicator.svelte index 5aab12e21e..c605160954 100644 --- a/plugins/love-resources/src/components/SharingStateIndicator.svelte +++ b/plugins/love-resources/src/components/SharingStateIndicator.svelte @@ -16,13 +16,12 @@ import { tooltip, eventToHTMLElement, showPopup } from '@hcengineering/ui' import love from '../plugin' - import { isSharingEnabled, isShareWithSound, screenSharing, liveKitClient } from '../utils' + import { isShareWithSound, liveKitClient } from '../utils' import SharingStatePopup from './SharingStatePopup.svelte' import IconShare from './icons/Share.svelte' - import { lkSessionConnected } from '../liveKitClient' + import { lkSessionConnected, ScreenSharingState, screenSharingState } from '../liveKitClient' - let disabled: boolean = false let pressed: boolean = false function handleShowPopup (ev: MouseEvent): void { @@ -33,15 +32,13 @@ } function handleShare (): void { - if (disabled) return + if ($screenSharingState !== ScreenSharingState.Inactive) return void liveKitClient.setScreenShareEnabled(true, $isShareWithSound) } - - $: disabled = !$screenSharing && !$lkSessionConnected {#if $lkSessionConnected} - {#if $isSharingEnabled} + {#if $screenSharingState === ScreenSharingState.Local}
-
-
- - diff --git a/plugins/process-resources/src/components/criterias/ArraySizeCriteria.svelte b/plugins/process-resources/src/components/criterias/ArraySizeCriteria.svelte new file mode 100644 index 0000000000..11c073d602 --- /dev/null +++ b/plugins/process-resources/src/components/criterias/ArraySizeCriteria.svelte @@ -0,0 +1,136 @@ + + + + +
+ {#if contextValue} + { + onSelect(e.detail) + }} + /> + {:else} +
+ +
+ {/if} +
+
+
+ + diff --git a/plugins/process-resources/src/components/criterias/AttributeCriteria.svelte b/plugins/process-resources/src/components/criterias/AttributeCriteria.svelte index 688845bc5f..6241641ab2 100644 --- a/plugins/process-resources/src/components/criterias/AttributeCriteria.svelte +++ b/plugins/process-resources/src/components/criterias/AttributeCriteria.svelte @@ -15,7 +15,7 @@
{ mode = e.detail - selectedMode = modes.find((m) => m.id === mode) ?? modes[0] - changeResult() + const prevEditor = selectedMode.editor ?? selectedMode.withoutEditor ? null : undefined + selectedMode = modesValues.find((m) => m.id === mode) ?? modesValues[0] + const newEditor = selectedMode.editor ?? selectedMode.withoutEditor ? null : undefined + if (prevEditor !== newEditor) { + val = undefined + } + changeResult(val) }} /> - {#if !selectedMode.withoutEditor} -
- {#if contextValue} - { - onSelect(e.detail) - }} - /> - {:else} -
- {#if baseEditor} - - {/if} -
- {/if} -
-
+ {#if selectedMode.editor} +
+ { + changeResult(e.detail) + }} + on:delete + />
+ {:else if !selectedMode.withoutEditor} + { + changeResult(e.detail) + }} + on:delete + /> {/if}
- - diff --git a/plugins/process-resources/src/components/criterias/BaseCriteriaEditor.svelte b/plugins/process-resources/src/components/criterias/BaseCriteriaEditor.svelte new file mode 100644 index 0000000000..3b4a4c8211 --- /dev/null +++ b/plugins/process-resources/src/components/criterias/BaseCriteriaEditor.svelte @@ -0,0 +1,142 @@ + + + + +
+ {#if contextValue} + { + onSelect(e.detail) + }} + /> + {:else} +
+ {#if baseEditor} + + {/if} +
+ {/if} +
+
+
+ + diff --git a/plugins/process-resources/src/components/criterias/BooleanCriteria.svelte b/plugins/process-resources/src/components/criterias/BooleanCriteria.svelte deleted file mode 100644 index 538ef8d874..0000000000 --- a/plugins/process-resources/src/components/criterias/BooleanCriteria.svelte +++ /dev/null @@ -1,33 +0,0 @@ - - - - - diff --git a/plugins/process-resources/src/components/criterias/DateCriteria.svelte b/plugins/process-resources/src/components/criterias/DateCriteria.svelte deleted file mode 100644 index 35ddfb8f21..0000000000 --- a/plugins/process-resources/src/components/criterias/DateCriteria.svelte +++ /dev/null @@ -1,33 +0,0 @@ - - - - - diff --git a/plugins/process-resources/src/components/criterias/EnumCriteria.svelte b/plugins/process-resources/src/components/criterias/EnumCriteria.svelte deleted file mode 100644 index 538ef8d874..0000000000 --- a/plugins/process-resources/src/components/criterias/EnumCriteria.svelte +++ /dev/null @@ -1,33 +0,0 @@ - - - - - diff --git a/plugins/process-resources/src/components/criterias/NumberCriteria.svelte b/plugins/process-resources/src/components/criterias/NumberCriteria.svelte deleted file mode 100644 index 35ddfb8f21..0000000000 --- a/plugins/process-resources/src/components/criterias/NumberCriteria.svelte +++ /dev/null @@ -1,33 +0,0 @@ - - - - - diff --git a/plugins/process-resources/src/components/criterias/RangeCriteria.svelte b/plugins/process-resources/src/components/criterias/RangeCriteria.svelte new file mode 100644 index 0000000000..c4faea5b68 --- /dev/null +++ b/plugins/process-resources/src/components/criterias/RangeCriteria.svelte @@ -0,0 +1,211 @@ + + + + +
+
+
+ {#if firstContextValue} + { + onSelect(e.detail, 0) + }} + /> + {:else} +
+ {#if baseEditor} + + {/if} +
+ {/if} +
+
+
+
+ {#if secondContextValue} + { + onSelect(e.detail, 1) + }} + /> + {:else} +
+ {#if baseEditor} + + {/if} +
+ {/if} +
+
+
+
+
+ + diff --git a/plugins/process-resources/src/components/criterias/RefCriteria.svelte b/plugins/process-resources/src/components/criterias/RefCriteria.svelte deleted file mode 100644 index 538ef8d874..0000000000 --- a/plugins/process-resources/src/components/criterias/RefCriteria.svelte +++ /dev/null @@ -1,33 +0,0 @@ - - - - - diff --git a/plugins/process-resources/src/components/criterias/StringCriteria.svelte b/plugins/process-resources/src/components/criterias/StringCriteria.svelte deleted file mode 100644 index 9791c454cc..0000000000 --- a/plugins/process-resources/src/components/criterias/StringCriteria.svelte +++ /dev/null @@ -1,33 +0,0 @@ - - - - - diff --git a/plugins/process-resources/src/components/presenters/UpdateAttributePresenter.svelte b/plugins/process-resources/src/components/presenters/UpdateAttributePresenter.svelte index 9c06d0aeec..cc65335f51 100644 --- a/plugins/process-resources/src/components/presenters/UpdateAttributePresenter.svelte +++ b/plugins/process-resources/src/components/presenters/UpdateAttributePresenter.svelte @@ -67,6 +67,10 @@ {#if presenter && !selectedMode.withoutEditor} {#if contextValue && context} + {:else if Array.isArray(val)} + {#each val as item} + + {/each} {:else} {/if} diff --git a/plugins/process-resources/src/components/settings/AddTagEditor.svelte b/plugins/process-resources/src/components/settings/AddTagEditor.svelte index 11ba9d4ad5..9daea38c9d 100644 --- a/plugins/process-resources/src/components/settings/AddTagEditor.svelte +++ b/plugins/process-resources/src/components/settings/AddTagEditor.svelte @@ -93,28 +93,30 @@ } -
- - - -
- -{#if possibleAttrs.length > 0} -
-
+ {/if} +
diff --git a/plugins/process-resources/src/components/settings/AsideStepEditor.svelte b/plugins/process-resources/src/components/settings/AsideStepEditor.svelte index 6cbd6af9db..ef8770cf11 100644 --- a/plugins/process-resources/src/components/settings/AsideStepEditor.svelte +++ b/plugins/process-resources/src/components/settings/AsideStepEditor.svelte @@ -16,9 +16,9 @@ {/if} - {#if step != null} - - {/if} +
+
+
+ + diff --git a/plugins/process-resources/src/components/settings/AsideTransitionEditor.svelte b/plugins/process-resources/src/components/settings/AsideTransitionEditor.svelte index 97802e0e5f..f405d7815e 100644 --- a/plugins/process-resources/src/components/settings/AsideTransitionEditor.svelte +++ b/plugins/process-resources/src/components/settings/AsideTransitionEditor.svelte @@ -83,9 +83,7 @@ />
{#if trigger.editor !== undefined} -
- -
+ {/if} {/if}
@@ -93,11 +91,7 @@ diff --git a/plugins/process-resources/src/components/settings/TimeEditor.svelte b/plugins/process-resources/src/components/settings/TimeEditor.svelte index 07f02062c7..cc40b8ca8c 100644 --- a/plugins/process-resources/src/components/settings/TimeEditor.svelte +++ b/plugins/process-resources/src/components/settings/TimeEditor.svelte @@ -84,7 +84,7 @@ bind:value={params.value} on:change={(e) => { params.value = e.detail - dispatch('change', params) + dispatch('change', { params }) }} />
diff --git a/plugins/process-resources/src/components/transformPresenters/NumberPresenter.svelte b/plugins/process-resources/src/components/transformPresenters/NumberPresenter.svelte index ab636cb8e1..2fbb386b7d 100644 --- a/plugins/process-resources/src/components/transformPresenters/NumberPresenter.svelte +++ b/plugins/process-resources/src/components/transformPresenters/NumberPresenter.svelte @@ -27,7 +27,8 @@ [plugin.function.Multiply]: '×', [plugin.function.Divide]: '/', [plugin.function.Modulo]: '%', - [plugin.function.Power]: '^' + [plugin.function.Power]: '^', + [plugin.function.Sqrt]: '√' } $: op = ops[value.func as keyof typeof ops] @@ -42,7 +43,7 @@ {/if} {#if contextValue && context} - {:else} + {:else if val != null} {val} {/if}
diff --git a/plugins/process-resources/src/index.ts b/plugins/process-resources/src/index.ts index 1bcf1c3c0d..f8550b3d6f 100644 --- a/plugins/process-resources/src/index.ts +++ b/plugins/process-resources/src/index.ts @@ -48,13 +48,9 @@ import MultiArrayElementEditor from './components/transformEditors/MultiArrayEle import DateOffsetEditor from './components/transformEditors/DateOffsetEditor.svelte' import NumberEditor from './components/transformEditors/NumberEditor.svelte' -import ArrayCriteria from './components/criterias/ArrayCriteria.svelte' -import BooleanCriteria from './components/criterias/BooleanCriteria.svelte' -import DateCriteria from './components/criterias/DateCriteria.svelte' -import EnumCriteria from './components/criterias/EnumCriteria.svelte' -import NumberCriteria from './components/criterias/NumberCriteria.svelte' -import RefCriteria from './components/criterias/RefCriteria.svelte' -import StringCriteria from './components/criterias/StringCriteria.svelte' +import ArraySizeCriteria from './components/criterias/ArraySizeCriteria.svelte' +import BaseCriteria from './components/criterias/BaseCriteria.svelte' +import RangeCriteria from './components/criterias/RangeCriteria.svelte' import LogActionPresenter from './components/LogActionPresenter.svelte' import NotifierExtension from './components/NotifierExtension.svelte' import AddRelationPresenter from './components/presenters/AddRelationPresenter.svelte' @@ -81,9 +77,11 @@ import { showDoneQuery, timeTransitionCheck, todoTranstionCheck, - updateCardTranstionCheck, - subProcessesDoneCheck + matchCardCheck, + subProcessesDoneCheck, + fieldChangesCheck } from './utils' +import FieldChangesEditor from './components/settings/FieldChangesEditor.svelte' export * from './query' @@ -136,16 +134,13 @@ export default async (): Promise => ({ TimePresenter, AddTagEditor, AddTagPresenter, - ExecutionMyToDos + ExecutionMyToDos, + FieldChangesEditor }, criteriaEditor: { - DateCriteria, - StringCriteria, - BooleanCriteria, - NumberCriteria, - RefCriteria, - EnumCriteria, - ArrayCriteria + BaseCriteria, + ArraySizeCriteria, + RangeCriteria }, transformPresenter: { NumberPresenter, @@ -162,7 +157,8 @@ export default async (): Promise => ({ CutEditor }, triggerCheck: { - UpdateCheck: updateCardTranstionCheck, + MatchCheck: matchCardCheck, + FieldChangedCheck: fieldChangesCheck, SubProcessesDoneCheck: subProcessesDoneCheck, ToDo: todoTranstionCheck, Time: timeTransitionCheck diff --git a/plugins/process-resources/src/middleware.ts b/plugins/process-resources/src/middleware.ts index 950f003f7c..9f252302ca 100644 --- a/plugins/process-resources/src/middleware.ts +++ b/plugins/process-resources/src/middleware.ts @@ -21,10 +21,11 @@ import core, { type TxApplyIf, type TxResult, type TxUpdateDoc, - TxProcessor + TxProcessor, + SortingOrder } from '@hcengineering/core' import { BasePresentationMiddleware, type PresentationMiddleware } from '@hcengineering/presentation' -import process, { ExecutionStatus, type ProcessToDo } from '@hcengineering/process' +import process, { ExecutionStatus, type ProcessToDo, isUpdateTx } from '@hcengineering/process' import { createExecution, getNextStateUserInput, requestResult, pickTransition } from './utils' import cardPlugin, { type Card } from '@hcengineering/card' @@ -68,8 +69,8 @@ export class ProcessMiddleware extends BasePresentationMiddleware implements Pre } private async handleCardUpdate (etx: Tx): Promise { - if (etx._class === core.class.TxUpdateDoc) { - const updateTx = etx as TxUpdateDoc + if (etx._class === core.class.TxUpdateDoc || etx._class === core.class.TxMixin) { + const updateTx = etx as TxUpdateDoc | TxMixin const hierarchy = this.client.getHierarchy() if (!hierarchy.isDerived(updateTx.objectClass, cardPlugin.class.Card)) return const executions = await this.client.findAll(process.class.Execution, { @@ -81,14 +82,23 @@ export class ProcessMiddleware extends BasePresentationMiddleware implements Pre _id: updateTx.objectId }) if (card === undefined) return - const updated = TxProcessor.updateDoc2Doc(hierarchy.clone(card), updateTx) + const updated = isUpdateTx(updateTx) + ? TxProcessor.updateDoc2Doc(hierarchy.clone(card), updateTx) + : TxProcessor.updateMixin4Doc(hierarchy.clone(card), updateTx) for (const execution of executions) { - const transitions = this.client.getModel().findAllSync(process.class.Transition, { - process: execution.process, - from: execution.currentState, - trigger: process.trigger.OnCardUpdate + const transitions = this.client.getModel().findAllSync( + process.class.Transition, + { + process: execution.process, + from: execution.currentState, + trigger: { $in: [process.trigger.OnCardUpdate, process.trigger.WhenFieldChanges] } + }, + { sort: { rank: SortingOrder.Ascending } } + ) + const transition = await pickTransition(this.client, execution, transitions, { + card: updated, + operations: isUpdateTx(updateTx) ? updateTx.operations : updateTx.attributes }) - const transition = await pickTransition(this.client, execution, transitions, updated) if (transition === undefined) return const context = await getNextStateUserInput(execution, transition, execution.context) const txop = new TxOperations(this.client, getCurrentAccount().primarySocialId) @@ -153,7 +163,9 @@ export class ProcessMiddleware extends BasePresentationMiddleware implements Pre from: execution.currentState, trigger: process.trigger.OnToDoClose }) - const transition = await pickTransition(this.client, execution, transitions, todo) + const transition = await pickTransition(this.client, execution, transitions, { + todo + }) if (transition === undefined) return const context = await getNextStateUserInput(execution, transition, execution.context) if (context !== undefined) { diff --git a/plugins/process-resources/src/plugin.ts b/plugins/process-resources/src/plugin.ts index 5570152def..41f333df5d 100644 --- a/plugins/process-resources/src/plugin.ts +++ b/plugins/process-resources/src/plugin.ts @@ -65,6 +65,7 @@ export default mergeIds(processId, process, { AddRelationPresenter: '' as AnyComponent, CardUpdateEditor: '' as AnyComponent, CardUpdatePresenter: '' as AnyComponent, + FieldChangesEditor: '' as AnyComponent, ToDoSettingPresenter: '' as AnyComponent, TimeEditor: '' as AnyComponent, TimePresenter: '' as AnyComponent, @@ -72,13 +73,9 @@ export default mergeIds(processId, process, { AddTagPresenter: '' as AnyComponent }, criteriaEditor: { - StringCriteria: '' as AnyComponent, - NumberCriteria: '' as AnyComponent, - DateCriteria: '' as AnyComponent, - BooleanCriteria: '' as AnyComponent, - ArrayCriteria: '' as AnyComponent, - EnumCriteria: '' as AnyComponent, - RefCriteria: '' as AnyComponent + BaseCriteria: '' as AnyComponent, + RangeCriteria: '' as AnyComponent, + ArraySizeCriteria: '' as AnyComponent }, transformEditor: { MultiArrayElementEditor: '' as AnyComponent, @@ -144,6 +141,7 @@ export default mergeIds(processId, process, { Divide: '' as IntlString, Modulo: '' as IntlString, Power: '' as IntlString, + Sqrt: '' as IntlString, Round: '' as IntlString, Absolute: '' as IntlString, Ceil: '' as IntlString, @@ -165,7 +163,8 @@ export default mergeIds(processId, process, { OnToDoDone: '' as IntlString, OnSubProcessesDone: '' as IntlString, WaitUntil: '' as IntlString, - OnCardUpdate: '' as IntlString, + WhenCardMatches: '' as IntlString, + WhenFieldChanges: '' as IntlString, Result: '' as IntlString, RequestResult: '' as IntlString, NoResultRequired: '' as IntlString, @@ -199,6 +198,9 @@ export default mergeIds(processId, process, { AddResult: '' as IntlString, For: '' as IntlString, Attribute: '' as IntlString, - Context: '' as IntlString + Context: '' as IntlString, + EmptyArray: '' as IntlString, + ExecutionInitiator: '' as IntlString, + ExecutionStarted: '' as IntlString } }) diff --git a/plugins/process-resources/src/query.ts b/plugins/process-resources/src/query.ts index d93249d62e..31f2626605 100644 --- a/plugins/process-resources/src/query.ts +++ b/plugins/process-resources/src/query.ts @@ -13,7 +13,9 @@ import { type QuerySelector } from '@hcengineering/core' import { getEmbeddedLabel, type IntlString } from '@hcengineering/platform' +import { type AnyComponent } from '@hcengineering/ui' import view from '@hcengineering/view-resources/src/plugin' +import plugin from './plugin' export interface Mode { id: string @@ -21,6 +23,7 @@ export interface Mode { query: QuerySelector | string parse?: (value: any) => any withoutEditor?: boolean + editor?: AnyComponent } const Equal: Mode = { @@ -47,6 +50,16 @@ const LT: Mode = { query: { $lt: '$val' as any } } +const Between: Mode = { + id: 'between', + label: view.string.Between, + query: { $gte: '$val[0]' as any, $lte: '$val[1]' as any }, + parse: (value: any): any => { + return [value.$gte, value.$lte] + }, + editor: plugin.criteriaEditor.RangeCriteria +} + const Exists: Mode = { id: 'exists', label: view.string.ValueIsSet, @@ -85,40 +98,46 @@ const ArrayNotIncludes: Mode = { const ArraySizeEquals: Mode = { id: 'sizeEquals', label: getEmbeddedLabel('='), - query: { $size: '$val' as any } + query: { $size: '$val' as any }, + editor: plugin.criteriaEditor.ArraySizeCriteria } const ArraySizeGt: Mode = { id: 'sizeGt', label: getEmbeddedLabel('>'), - query: { $size: { $gt: '$val' as any } } + query: { $size: { $gt: '$val' as any } }, + editor: plugin.criteriaEditor.ArraySizeCriteria } const ArraySizeGte: Mode = { id: 'sizeGte', label: getEmbeddedLabel('≥'), - query: { $size: { $gte: '$val' as any } } + query: { $size: { $gte: '$val' as any } }, + editor: plugin.criteriaEditor.ArraySizeCriteria } const ArraySizeLt: Mode = { id: 'sizeLt', label: getEmbeddedLabel('<'), - query: { $size: { $lt: '$val' as any } } + query: { $size: { $lt: '$val' as any } }, + editor: plugin.criteriaEditor.ArraySizeCriteria } const ArraySizeLte: Mode = { id: 'sizeLte', label: getEmbeddedLabel('≤'), - query: { $size: { $lte: '$val' as any } } + query: { $size: { $lte: '$val' as any } }, + editor: plugin.criteriaEditor.ArraySizeCriteria } -export const Modes: Record = { +export const Modes = { Exists, Equal, NotEqual, StringContains, GT, LT, + Between, ArrayAll, ArrayAny, ArrayNotIncludes, @@ -129,58 +148,85 @@ export const Modes: Record = { ArraySizeLte } as const +export type ModeId = keyof typeof Modes + +function hasSameKeys (target: any, value: any): boolean { + if (typeof target === 'object' && target !== null && typeof value === 'object' && value !== null) { + const keys1 = Object.keys(target) + const keys2 = Object.keys(value) + + if (keys1.length !== keys2.length) return false + for (const k of keys1) { + if (!keys2.includes(k)) return false + } + + for (const k of keys1) { + if (!hasSameKeys(target[k], value[k])) return false + } + return true + } else { + return typeof target !== 'object' && typeof value !== 'object' + } +} + +function isModeMatch (mode: Mode, value: any): boolean { + if (typeof mode.query !== 'object') return typeof value !== 'object' || Array.isArray(value) + if (typeof mode.query === 'object' && (typeof value !== 'object' || Array.isArray(value))) return false + return hasSameKeys(mode.query, value) +} + +function getValue (_value: any): any { + let value = _value + while (typeof value === 'object' && !Array.isArray(value) && Object.keys(value).length === 1) { + value = value[Object.keys(value)[0]] + } + return value +} + export function parseValue (modes: Mode[], value: any): [any, Mode] { if (value == null) { return [value, modes[0]] } for (const mode of modes) { - if (typeof mode.query === 'string' && typeof value !== 'object') { - return [value, mode] - } - let obj1: any = mode.query - let obj2: any = value - while (typeof obj1 === 'object' && typeof obj2 === 'object' && Object.keys(obj1)[0] === Object.keys(obj2)[0]) { - const key1 = Object.keys(obj1)[0] - const key2 = Object.keys(obj2)[0] - if ( - ['string', 'boolean'].includes(typeof obj1[key1]) && - (typeof obj2[key2] !== 'object' || Array.isArray(obj2[key2])) - ) { - if (mode.parse !== undefined) { - return [mode.parse(obj2[key2]), mode] - } - return [mode.withoutEditor === true ? undefined : obj2[key2], mode] + if (isModeMatch(mode, value)) { + if (mode.parse != null) { + return [mode.parse(getValue(value)), mode] } - obj1 = obj1[key1] - obj2 = obj2[key2] + + return [getValue(value), mode] } } return [value, modes[0]] } export function buildResult (mode: Mode, value: any): any { - let q = mode.query - if (typeof q !== 'object') return value - const result: any = {} - let res = result - while (true) { - if (typeof q === 'object') { - const key = Object.keys(q)[0] - const v: any = (q as any)[key] - if (typeof v !== 'object') { - if (typeof value === 'string' && typeof v === 'string') { - res[key] = v.replace('$val', value) - } else { - res[key] = mode.withoutEditor === true ? v : value ?? v - } - return result - } - q = v - res[key] = {} - res = res[key] + if (typeof mode.query !== 'object') return value + const res = JSON.parse(JSON.stringify(mode.query)) + fillResult(mode, res, value) + return res +} + +function fillResult (mode: Mode, obj: any, value: any): void { + if (typeof obj !== 'object') return + for (const key in obj) { + const v: any = obj[key] + if (typeof v === 'object') { + fillResult(mode, v, value) } else { - break + if (typeof value === 'string' && typeof v === 'string') { + obj[key] = v.replace('$val', value) + } else if (typeof v === 'string' && v === '$val') { + obj[key] = value + } else if (typeof v === 'string' && v.startsWith('$val[')) { + const index = parseInt(v.slice(5, -1)) + if (Array.isArray(value) && !isNaN(index) && index >= 0 && index < value.length) { + obj[key] = value[index] + } else { + obj[key] = undefined + } + } else { + obj[key] = mode.withoutEditor === true ? v : value ?? v + } } } - return result } diff --git a/plugins/process-resources/src/types.ts b/plugins/process-resources/src/types.ts index 8c7fb27624..2b3fee6a76 100644 --- a/plugins/process-resources/src/types.ts +++ b/plugins/process-resources/src/types.ts @@ -13,10 +13,12 @@ import { type DocumentQuery } from '@hcengineering/core' import { type IntlString } from '@hcengineering/platform' -import { type Execution } from '@hcengineering/process' +import { type ProcessContext, type Execution } from '@hcengineering/process' export interface Special { _id: string label: IntlString baseQuery: DocumentQuery } + +export type ProcessContextView = Pick & { index?: number } diff --git a/plugins/process-resources/src/utils.ts b/plugins/process-resources/src/utils.ts index 879dc76bab..4d0da0d64c 100644 --- a/plugins/process-resources/src/utils.ts +++ b/plugins/process-resources/src/utils.ts @@ -50,9 +50,10 @@ import { type Step, type StepId, type Transition, + type UpdateCriteriaComponent, type UserResult } from '@hcengineering/process' -import { type AnyComponent, showPopup } from '@hcengineering/ui' +import { showPopup } from '@hcengineering/ui' import { type AttributeCategory } from '@hcengineering/view' import process from './plugin' @@ -112,7 +113,7 @@ export async function pickTransition ( client: Client, execution: Execution, transitions: Transition[], - doc: Doc + context: Record ): Promise { for (const tr of transitions) { const trigger = client.getModel().findObject(tr.trigger) @@ -121,7 +122,7 @@ export async function pickTransition ( const filled = fillParams(tr.triggerParams, execution) const checkFunc = await getResource(trigger.checkFunction) if (checkFunc === undefined) continue - const res = await checkFunc(client, execution, filled, doc) + const res = await checkFunc(client, execution, filled, context) if (res) return tr } } @@ -151,10 +152,10 @@ export async function initState (methodId: Ref>): Promi const step: Step = { _id: generateId() as string as StepId, context: - method.contextClass !== null + method.createdContext !== null ? { _id: generateContextId(), - _class: method.contextClass + _class: method.createdContext._class } : null, methodId, @@ -209,41 +210,45 @@ export function getContext ( const relationsA = allRelations.filter((it) => descendants.has(it.classA)) for (const rel of relationsA) { - const refAttributes = getClassAttributes(client, rel.classB, target, 'attribute') - if (refAttributes.length > 0) { - relations[rel.nameB] = { - name: rel.nameB, - association: rel._id, - direction: 'B', - attributes: refAttributes - } - } else if (['object', 'array'].includes(category) && client.getHierarchy().isDerived(rel.classB, target)) { + if (['object', 'array'].includes(category) && client.getHierarchy().isDerived(rel.classB, target)) { relations[rel.nameB] = { name: rel.nameB, association: rel._id, direction: 'B', attributes: [] } + } else { + const refAttributes = getClassAttributes(client, rel.classB, target, 'attribute') + if (refAttributes.length > 0) { + relations[rel.nameB] = { + name: rel.nameB, + association: rel._id, + direction: 'B', + attributes: refAttributes + } + } } } const relationsB = allRelations.filter((it) => descendants.has(it.classB)) for (const rel of relationsB) { - const refAttributes = getClassAttributes(client, rel.classA, target, 'attribute') - if (refAttributes.length > 0) { - relations[rel.nameA] = { - name: rel.nameA, - association: rel._id, - direction: 'A', - attributes: refAttributes - } - } else if (['object', 'array'].includes(category) && client.getHierarchy().isDerived(rel.classA, target)) { + if (['object', 'array'].includes(category) && client.getHierarchy().isDerived(rel.classA, target)) { relations[rel.nameA] = { name: rel.nameA, association: rel._id, direction: 'A', attributes: [] } + } else { + const refAttributes = getClassAttributes(client, rel.classA, target, 'attribute') + if (refAttributes.length > 0) { + relations[rel.nameA] = { + name: rel.nameA, + association: rel._id, + direction: 'A', + attributes: refAttributes + } + } } } @@ -292,7 +297,7 @@ function getContextFunctions ( switch (category) { case 'array': { if (func.category === 'array') { - if (hierarchy.isDerived(func.of, target)) { + if (hierarchy.isDerived(func.of, target) || func.of === core.class.ArrOf) { matched.push(func._id) } } @@ -571,21 +576,21 @@ export async function requestResult ( results: UserResult[] | undefined, context: ExecutionContext ): Promise { - if (results == null) return - for (const result of results) { - const promise = new Promise((resolve, reject) => { - showPopup(process.component.ResultInput, { type: result.type, name: result.name }, undefined, (res) => { - if (result._id === undefined) return - if (res?.value !== undefined) { - context[result._id] = res.value - resolve() - } else { - reject(new PlatformError(new Status(Severity.ERROR, process.error.ResultNotProvided, {}))) + if (results == null || results.length === 0) return + const promise = new Promise((resolve, reject) => { + showPopup(process.component.ResultInput, { results, context }, undefined, (res) => { + if (res !== undefined) { + for (const contextId in res) { + const val = res[contextId] + context[contextId as ContextId] = val } - }) + resolve() + } else { + reject(new PlatformError(new Status(Severity.ERROR, process.error.ResultNotProvided, {}))) + } }) - await promise - } + }) + await promise await txop.update(execution, { context }) @@ -595,10 +600,10 @@ export function todoTranstionCheck ( client: Client, execution: Execution, params: Record, - doc: Doc + context: Record ): boolean { if (params._id === undefined) return false - return doc._id === params._id + return context.todo?._id === params._id } export function timeTransitionCheck ( @@ -611,12 +616,28 @@ export function timeTransitionCheck ( return params.value <= Date.now() } -export function updateCardTranstionCheck ( +export function matchCardCheck ( client: Client, execution: Execution, params: Record, - doc: Doc + context: Record ): boolean { + const doc = context.card + if (doc === undefined) return false + const res = matchQuery([doc], params, doc._class, client.getHierarchy(), true) + return res.length > 0 +} + +export function fieldChangesCheck ( + client: Client, + execution: Execution, + params: Record, + context: Record +): boolean { + const doc = context.card + if (doc === undefined) return false + const param = Object.keys(params)[0] + if (!Object.keys(context.operations ?? {}).includes(param)) return false const res = matchQuery([doc], params, doc._class, client.getHierarchy(), true) return res.length > 0 } @@ -634,17 +655,20 @@ export async function subProcessesDoneCheck ( return res === undefined } -export function getCirteriaEditor (of: Ref>, category: AttributeCategory): AnyComponent | undefined { +export function getCirteriaEditor ( + of: Ref>, + category: AttributeCategory +): UpdateCriteriaComponent | undefined { const client = getClient() if (category !== 'attribute') { const res = client.getModel().findAllSync(process.class.UpdateCriteriaComponent, { category })[0] - return res?.editor + return res } const res = client.getModel().findAllSync(process.class.UpdateCriteriaComponent, { category, of })[0] - return res?.editor + return res } diff --git a/plugins/process/src/index.ts b/plugins/process/src/index.ts index 90d8affa4c..e53c38c111 100644 --- a/plugins/process/src/index.ts +++ b/plugins/process/src/index.ts @@ -38,7 +38,7 @@ export interface Process extends Doc { export interface ProcessContext { name: string _class: Ref> - action?: StepId + action: StepId index: number producer: Ref isResult?: boolean @@ -165,10 +165,15 @@ export interface Method extends Doc { description?: IntlString editor?: AnyComponent presenter?: AnyComponent - contextClass: Ref> | null + createdContext: CreatedContext | null defaultParams?: MethodParams } +export interface CreatedContext { + _class: Ref> + nameField?: string +} + export interface ProcessFunction extends Doc { type: 'transform' | 'reduce' | 'context' of: Ref> @@ -183,6 +188,7 @@ export interface UpdateCriteriaComponent extends Doc { category: AttributeCategory editor: AnyComponent of: Ref> + props: Record } export * from './errors' @@ -211,7 +217,8 @@ export default plugin(processId, { AddTag: '' as Ref> }, trigger: { - OnCardUpdate: '' as Ref, + OnCardUpdate: '' as Ref, // in fact WhenCardMatches, should migrate in future + WhenFieldChanges: '' as Ref, OnSubProcessesDone: '' as Ref, OnToDoClose: '' as Ref, OnToDoRemove: '' as Ref, @@ -221,7 +228,8 @@ export default plugin(processId, { }, triggerCheck: { ToDo: '' as Resource, - UpdateCheck: '' as Resource, + MatchCheck: '' as Resource, + FieldChangedCheck: '' as Resource, SubProcessesDoneCheck: '' as Resource, Time: '' as Resource }, @@ -234,7 +242,10 @@ export default plugin(processId, { From: '' as IntlString, To: '' as IntlString, Trigger: '' as IntlString, - Actions: '' as IntlString + Actions: '' as IntlString, + ProcessRunned: '' as IntlString, + ProcessStateChanged: '' as IntlString, + ProcessFinished: '' as IntlString }, error: { MethodNotFound: '' as IntlString, @@ -257,7 +268,8 @@ export default plugin(processId, { Steps: '' as Asset, States: '' as Asset, ToDo: '' as Asset, - OnCardUpdate: '' as Asset, + WhenCardMatches: '' as Asset, + WhenFieldChanges: '' as Asset, WaitSubprocesses: '' as Asset, ToDoRemove: '' as Asset, Start: '' as Asset, @@ -282,6 +294,7 @@ export default plugin(processId, { Divide: '' as Ref, Modulo: '' as Ref, Power: '' as Ref, + Sqrt: '' as Ref, Round: '' as Ref, Absolute: '' as Ref, Ceil: '' as Ref, @@ -296,6 +309,10 @@ export default plugin(processId, { RemoveLast: '' as Ref, CurrentEmployee: '' as Ref, CurrentUser: '' as Ref, + ExecutionStarted: '' as Ref, + ExecutionEmployeeInitiator: '' as Ref, + ExecutionInitiator: '' as Ref, + EmptyArray: '' as Ref, CurrentDate: '' as Ref } }) diff --git a/plugins/process/src/utils.ts b/plugins/process/src/utils.ts index ddf16a8253..d025963a3a 100644 --- a/plugins/process/src/utils.ts +++ b/plugins/process/src/utils.ts @@ -1,4 +1,7 @@ +import { Tx, TxUpdateDoc } from '@hcengineering/core/types/tx' import { SelectedContext } from './types' +import core from '@hcengineering/core' +import { Card } from '@hcengineering/card' export function parseContext (value: any): SelectedContext | undefined { if (value === undefined) return @@ -14,3 +17,7 @@ export function parseContext (value: any): SelectedContext | undefined { return res } catch {} } + +export function isUpdateTx (etx: Tx): etx is TxUpdateDoc { + return etx._class === core.class.TxUpdateDoc +} diff --git a/plugins/products-assets/lang/tr.json b/plugins/products-assets/lang/tr.json new file mode 100644 index 0000000000..f29708d9a9 --- /dev/null +++ b/plugins/products-assets/lang/tr.json @@ -0,0 +1,39 @@ +{ + "string": { + "Product": "Ürün", + "Products": "Ürünler", + "ProductsApplication": "Ürünler", + "ProductNamePlaceholder": "Ürün", + "ProductDescriptionPlaceholder": "Açıklama ekle...", + "ProductVersion": "Ürün sürümü", + "ProductVersions": "Ürün sürümleri", + "ProductVersionDescriptionPlaceholder": "Açıklama ekle...", + "ProductVersionParent": "Üst sürüm", + "ProductVersionState": "Durum", + "SearchProduct": "Ürün ara...", + "CreateProduct": "Ürün oluştur", + "CreateProductVersion": "Ürün sürümü oluştur", + "NoProductVersionParent": "Üst sürüm yok", + "NoProductVersions": "Ürün sürümü yok", + "CreateDialogClose": "Bu diyalogu kapatmak istiyor musunuz?", + "CreateDialogCloseNote": "Tüm değişiklikler kaybolacak", + "Description": "Açıklama", + "Major": "Majör", + "Minor": "Minör", + "Codename": "Kod adı", + "ProductVersionStateActive": "Aktif", + "ProductVersionStateReleased": "Yayınlandı", + "Icon": "İkon", + "Color": "Renk", + "Private": "Özel", + "Public": "Genel", + "Members": "Üyeler", + "RoleLabel": "Rol: {role}", + "UpdateProductPermission": "Ürünü güncelle", + "UpdateProductDescription": "Kullanıcılara ürün güncelleme yetkisi verir", + "ChangeControl": "Değişiklik kontrolü", + "ChangeSeverity": "Değişiklik şiddeti", + "ConfigLabel": "Ürünler", + "ConfigDescription": "Ürünleri yönetmek için uzantı" + } +} diff --git a/plugins/questions-assets/lang/tr.json b/plugins/questions-assets/lang/tr.json new file mode 100644 index 0000000000..1e6c30e8d9 --- /dev/null +++ b/plugins/questions-assets/lang/tr.json @@ -0,0 +1,35 @@ +{ + "string": { + "Answer": "Cevap", + "Answers": "Cevaplar", + "Assessment": "Değerlendirme", + "Assessments": "Değerlendirmeler", + "CorrectAnswer": "Doğru Cevap", + "CorrectAnswers": "Doğru Cevaplar", + "Duplicate": "Çoğalt", + "Failed": "Başarısız", + "MultipleChoice": "Çoklu seç", + "MultipleChoiceAssessment": "Çoklu seçim", + "MultipleChoiceQuestion": "Çoklu seçim (puanlanmaz)", + "NoQuestions": "Soru Yok", + "Option": "Seçenek", + "Owner": "Sahip", + "Options": "Seçenekler", + "Ordering": "Doğru sıraya koy", + "OrderingAssessment": "Sıralama", + "OrderingQuestion": "Sıralama (puanlanmaz)", + "Passed": "Geçti", + "Question": "Soru", + "Questions": "Sorular", + "Rank": "Sıra", + "ReleasedBy": "Yayınlayan", + "ReleasedDate": "Yayın Tarihi", + "Score": "Puan", + "SingleChoice": "Seç", + "SingleChoiceAssessment": "Tekli seçim", + "SingleChoiceQuestion": "Tekli seçim (puanlanmaz)", + "TypePercentage": "Yüzde", + "TypeQuestionOption": "Seçenek", + "TypeRank": "Sıra" + } +} diff --git a/plugins/recorder-assets/lang/tr.json b/plugins/recorder-assets/lang/tr.json new file mode 100644 index 0000000000..73eda64a5c --- /dev/null +++ b/plugins/recorder-assets/lang/tr.json @@ -0,0 +1,33 @@ +{ + "string": { + "Cancel": "İptal", + "Pause": "Duraklat", + "Stop": "Durdur", + "Resume": "Devam et", + "Record": "Kaydet", + "Done": "Tamam", + "CancelRecording": "Kaydı iptal et", + "CancelRecordingConfirm": "Kaydı iptal etmek istediğinizden emin misiniz?", + "RestartRecording": "Kaydı yeniden başlat", + "RestartRecordingConfirm": "Kaydı yeniden başlatmak istediğinizden emin misiniz?", + "ScreenRecordingName": "Ekran Kaydı {date}", + "CameraRecordingName": "Kamera Kaydı {date}", + "ClickToSkip": "Atlamak için tıkla", + "RecordVideo": "Video kaydet", + "ShareWithAudio": "Ses ile paylaş", + "ShareScreen": "Ekranı paylaş", + "StopSharing": "Paylaşmayı durdur", + "SelectVideoToRecord": "Kaydetmek için video kamerayı etkinleştirin veya ekranı paylaşın", + "CameraSize": "Kamera boyutu", + "CameraPos": "Kamera konumu", + "Small": "Küçük", + "Medium": "Orta", + "Large": "Büyük", + "TopLeft": "Sol üst", + "TopRight": "Sağ üst", + "BottomLeft": "Sol alt", + "BottomRight": "Sağ alt", + "Resolution": "Çözünürlük", + "Original": "Orijinal" + } +} diff --git a/plugins/recruit-assets/lang/cs.json b/plugins/recruit-assets/lang/cs.json index 0bd3217c48..c5282e70d2 100644 --- a/plugins/recruit-assets/lang/cs.json +++ b/plugins/recruit-assets/lang/cs.json @@ -122,11 +122,13 @@ "HideArchivedVacancies": "Skrýt archivované pozice", "HideApplicantsFromArchivedVacancies": "Skrýt z archivovaných pozic", "CreateNewSkills": "Vytvořit nové dovednosti, pokud neexistují", - "SwapFirstAndLastNames": "Vyměňte jméno a příjmení" + "SwapFirstAndLastNames": "Vyměňte jméno a příjmení", + "ForbidCreateVacancyPermission": "Zakázat vytvoření pozice", + "ForbidCreateVacancyPermissionDescription": "Zakazuje uživatelům vytvářet nové volné pozice" }, "status": { "ApplicationExists": "Přihláška již existuje", "TalentRequired": "Vyberte talent", "VacancyRequired": "Vyberte pozici" } -} \ No newline at end of file +} diff --git a/plugins/recruit-assets/lang/de.json b/plugins/recruit-assets/lang/de.json index c730be5d36..99d3f00291 100644 --- a/plugins/recruit-assets/lang/de.json +++ b/plugins/recruit-assets/lang/de.json @@ -105,24 +105,26 @@ "MoveApplication": "Zu anderer Stelle verschieben", "SearchVacancy": "Stelle suchen...", "Organizations": "Unternehmen", - + "TemplateReplace": "Möchten Sie die neue Vorlage anwenden?", "TemplateReplaceConfirm": "Alle Felder werden mit den Werten der neuen Vorlage überschrieben", "Apply": "Anwenden", - + "OpenVacancyList": "Liste öffnen", "Export": "Exportieren", "ConfigLabel": "Rekrutierung", "ConfigDescription": "Erweiterung zur Verwaltung von Talenten/Bewerbern und Stellen.", "MyApplications": "Meine Bewerbungen", - + "ShowApplications": "Bewerbungen anzeigen", "GetTalentIds": "Talent-IDs abrufen", "HideDoneState": "Abgeschlossene Bewerbungen ausblenden", "HideArchivedVacancies": "Archivierte Stellen ausblenden", "HideApplicantsFromArchivedVacancies": "Aus archivierten Stellen ausblenden", "CreateNewSkills": "Neue Fähigkeiten erstellen, wenn keine bestehenden gefunden werden", - "SwapFirstAndLastNames": "Vor- und Nachnamen tauschen" + "SwapFirstAndLastNames": "Vor- und Nachnamen tauschen", + "ForbidCreateVacancyPermission": "Stellenerstellung verbieten", + "ForbidCreateVacancyPermissionDescription": "Verbietet Benutzern das Erstellen neuer Stellenangebote" }, "status": { "ApplicationExists": "Bewerbung existiert bereits", diff --git a/plugins/recruit-assets/lang/en.json b/plugins/recruit-assets/lang/en.json index c8a45adecc..55787d737a 100644 --- a/plugins/recruit-assets/lang/en.json +++ b/plugins/recruit-assets/lang/en.json @@ -122,7 +122,9 @@ "HideArchivedVacancies": "Hide archived Vacancies", "HideApplicantsFromArchivedVacancies": "Hide from archived Vacancies", "CreateNewSkills": "Create new skills if existing not found", - "SwapFirstAndLastNames": "Swap first and last names" + "SwapFirstAndLastNames": "Swap first and last names", + "ForbidCreateVacancyPermission": "Forbid create vacancy", + "ForbidCreateVacancyPermissionDescription": "Forbid users creating new vacancies" }, "status": { "ApplicationExists": "Application already exists", diff --git a/plugins/recruit-assets/lang/es.json b/plugins/recruit-assets/lang/es.json index 4d4a299ad5..c3075d7f36 100644 --- a/plugins/recruit-assets/lang/es.json +++ b/plugins/recruit-assets/lang/es.json @@ -119,7 +119,9 @@ "HideArchivedVacancies": "Ocultar vacantes archivadas", "HideApplicantsFromArchivedVacancies": "Ocultar de vacantes archivadas", "CreateNewSkills": "Crear nuevas habilidades si no se encuentran las existentes", - "SwapFirstAndLastNames": "Intercambie nombres y apellidos" + "SwapFirstAndLastNames": "Intercambie nombres y apellidos", + "ForbidCreateVacancyPermission": "Prohibir crear vacante", + "ForbidCreateVacancyPermissionDescription": "Prohíbe a los usuarios crear nuevas vacantes" }, "status": { "ApplicationExists": "La solicitud ya existe", diff --git a/plugins/recruit-assets/lang/fr.json b/plugins/recruit-assets/lang/fr.json index 5d15dfd695..986dd1a7bf 100644 --- a/plugins/recruit-assets/lang/fr.json +++ b/plugins/recruit-assets/lang/fr.json @@ -119,11 +119,13 @@ "HideArchivedVacancies": "Masquer les postes vacants archivés", "HideApplicantsFromArchivedVacancies": "Masquer les candidats des postes vacants archivés", "CreateNewSkills": "Créer de nouvelles compétences si les existantes ne sont pas trouvées", - "SwapFirstAndLastNames": "Permuter le prénom et le nom" + "SwapFirstAndLastNames": "Permuter le prénom et le nom", + "ForbidCreateVacancyPermission": "Interdire la création de poste vacant", + "ForbidCreateVacancyPermissionDescription": "Interdit aux utilisateurs de créer de nouveaux postes vacants" }, "status": { "ApplicationExists": "La candidature existe déjà", "TalentRequired": "Veuillez sélectionner un talent", "VacancyRequired": "Veuillez sélectionner un poste vacant" } -} \ No newline at end of file +} diff --git a/plugins/recruit-assets/lang/it.json b/plugins/recruit-assets/lang/it.json index 75da996945..6f4676579b 100644 --- a/plugins/recruit-assets/lang/it.json +++ b/plugins/recruit-assets/lang/it.json @@ -120,7 +120,9 @@ "HideArchivedVacancies": "Nascondi posizioni archiviate", "HideApplicantsFromArchivedVacancies": "Nascondi da posizioni archiviate", "CreateNewSkills": "Crea nuove competenze se quelle esistenti non vengono trovate", - "SwapFirstAndLastNames": "Scambia nome e cognome" + "SwapFirstAndLastNames": "Scambia nome e cognome", + "ForbidCreateVacancyPermission": "Vieta creazione posizione aperta", + "ForbidCreateVacancyPermissionDescription": "Vieta agli utenti di creare nuove posizioni aperte" }, "status": { "ApplicationExists": "La candidatura esiste già", diff --git a/plugins/recruit-assets/lang/ja.json b/plugins/recruit-assets/lang/ja.json index 372283aa42..ceaed73869 100644 --- a/plugins/recruit-assets/lang/ja.json +++ b/plugins/recruit-assets/lang/ja.json @@ -119,7 +119,9 @@ "HideArchivedVacancies": "アーカイブされた求人を非表示", "HideApplicantsFromArchivedVacancies": "アーカイブされた求人から非表示", "CreateNewSkills": "既存のスキルが見つからない場合は新しいスキルを作成", - "SwapFirstAndLastNames": "名と姓を入れ替える" + "SwapFirstAndLastNames": "名と姓を入れ替える", + "ForbidCreateVacancyPermission": "求人の作成禁止", + "ForbidCreateVacancyPermissionDescription": "ユーザーが新しい求人を作成することを禁止します" }, "status": { "ApplicationExists": "応募はすでに存在します", diff --git a/plugins/recruit-assets/lang/pt.json b/plugins/recruit-assets/lang/pt.json index 3337675aef..c87178ade6 100644 --- a/plugins/recruit-assets/lang/pt.json +++ b/plugins/recruit-assets/lang/pt.json @@ -119,7 +119,9 @@ "HideArchivedVacancies": "Ocultar vagas arquivadas", "HideApplicantsFromArchivedVacancies": "Ocultar de vagas arquivadas", "CreateNewSkills": "Criar novas competências se as existentes não forem encontradas", - "SwapFirstAndLastNames": "Trocar primeiro e último nome" + "SwapFirstAndLastNames": "Trocar primeiro e último nome", + "ForbidCreateVacancyPermission": "Proibir criação de vaga", + "ForbidCreateVacancyPermissionDescription": "Proíbe os utilizadores de criar novas vagas" }, "status": { "ApplicationExists": "A candidatura já existe", diff --git a/plugins/recruit-assets/lang/ru.json b/plugins/recruit-assets/lang/ru.json index b75c55fa3e..28ffab2e86 100644 --- a/plugins/recruit-assets/lang/ru.json +++ b/plugins/recruit-assets/lang/ru.json @@ -122,7 +122,9 @@ "HideArchivedVacancies": "Скрыть архивные вакансии", "HideApplicantsFromArchivedVacancies": "Скрыть из архивных вакансии", "CreateNewSkills": "Создать навыки, если не найдены существующие", - "SwapFirstAndLastNames": "Поменять местами имя и фамилию" + "SwapFirstAndLastNames": "Поменять местами имя и фамилию", + "ForbidCreateVacancyPermission": "Запретить создание вакансии", + "ForbidCreateVacancyPermissionDescription": "Запрещает пользователям создавать новые вакансии" }, "status": { "ApplicationExists": "Кандидат уже существует", diff --git a/plugins/recruit-assets/lang/tr.json b/plugins/recruit-assets/lang/tr.json new file mode 100644 index 0000000000..0239f3ea26 --- /dev/null +++ b/plugins/recruit-assets/lang/tr.json @@ -0,0 +1,129 @@ +{ + "string": { + "RecruitApplication": "İşe Alım", + "Vacancies": "İş İlanları", + "TalentPools": "Yetenek havuzu", + "Talents": "Yetenekler", + "VacancyName": "İlan Adı *", + "VacancyDescription": "İlan Açıklaması", + "CreateVacancy": "İlan Oluştur", + "Vacancy": "İş İlanı", + "VacancyCreateLabel": "İş İlanı", + "CompanyCreateLabel": "Şirket", + "VacancyPlaceholder": "Yazılım Mühendisi", + "CreateAnApplication": "Yeni Başvuru", + "NoVacancies": "İlan Yok", + "NoApplicationsForTalent": "Bu yetenek için başvuru yok.", + "NoApplicationsForVacancy": "Bu ilan için başvuru yok.", + "CreateApplication": "Yeni Başvuru", + "ApplicationCreateLabel": "Başvuru", + "SelectVacancy": "İlan seç", + "Talent": "Yetenek", + "TalentCreateLabel": "Yetenek", + "CreateTalent": "Yeni Yetenek", + "CreateTalentDialogClose": "Bu diyalogu kapatmak istiyor musunuz?", + "CreateTalentDialogCloseNote": "Tüm değişiklikler kaybolacak", + "ResumeDraft": "Özgeçmiş taslağı", + "AssignRecruiter": "İşe alım uzmanı ata", + "UnAssignRecruiter": "İşe alım uzmanını kaldır", + "UnAssignCompany": "Şirketi kaldır", + "Recruiters": "İşe alım uzmanları", + "Create": "Oluştur", + "Applications": "Başvurular", + "ThisVacancyIsPrivate": "Bu ilan özel", + "Description": "Açıklama", + "Company": "Şirket", + "Edit": "Düzenle", + "Delete": "Sil", + "WorkLocationPreferences": "Çalışma konumu tercihleri", + "Onsite": "Yerinde", + "Remote": "Uzaktan", + "SearchApplication": "Başvuru ara...", + "Application": "Başvuru", + "AssignedRecruiter": "Atanan işe alım uzmanı", + "SkillLabel": "Yetenek", + "SkillsLabel": "Yetenekler", + "SkillCreateLabel": "Yetenek", + "General": "Genel", + "Members": "Üyeler", + "Yes": "Evet", + "No": "Hayır", + "NA": "Belirsiz", + "ApplicationsShort": "Başv.", + "Due": "Bitiş tarihi", + "Location": "Konum", + "Title": "Başlık", + "Source": "Kaynak", + "PersonFirstNamePlaceholder": "Ad", + "PersonLastNamePlaceholder": "Soyad", + "PersonLocationPlaceholder": "Konum", + "ManageVacancyStatuses": "İlan tiplerini yönet", + "EditVacancy": "Düzenle", + "FullDescription": "Tam açıklama", + "CreateReview": "İnceleme Planla", + "CreateReviewParams": "{label} Planla", + "Reviews": "İncelemeler", + "Review": "İnceleme", + "ReviewCreateLabel": "İnceleme", + "NewReview": "Yeni İnceleme", + "Opinions": "Görüşler", + "Opinion": "Görüş", + "OpinionValue": "Değerlendirme", + "StartDate": "Başlangıç tarihi", + "DueDate": "Bitiş tarihi", + "Verdict": "Karar", + "OpinionSave": "Kaydet", + "TalentReviews": "Tüm Yetenek İncelemeleri", + "NoReviewForCandidate": "İnceleme yok", + "CreateAnReview": "İnceleme oluştur", + "CreateOpinion": "Görüş oluştur", + "OpinionValuePlaceholder": "10/10", + "Participants": "Katılımcılar", + "NoParticipants": "Katılımcı eklenmedi", + "PersonsLabel": "{name}", + "AddDescription": "Açıklama ekle", + "NumberSkills": "{count, plural, =0 {yetenek yok} =1 {1 yetenek} other {# yetenek}}", + "GotoTalents": "Yeteneklere Git", + "GotoVacancies": "İlanlara Git", + "GotoSkills": "Yeteneklere Git", + "GotoMyApplications": "Başvurularıma Git", + "GotoApplicants": "Başvurulara Git", + "GotoRecruitApplication": "İşe Alım Uygulamasına Geç", + "AddDropHere": "Özgeçmiş ekle veya sürükle", + "Uploading": "Yükleniyor...", + "Parsing": "Ayrıştırılıyor...", + "CopyId": "ID'yi Kopyala", + "CopyLink": "Bağlantıyı kopyala", + "HasActiveApplicant": "Sadece Aktif", + "HasNoActiveApplicant": "Aktif Değil", + "NoneApplications": "Hiçbiri", + "VacancyList": "İş İlanları", + "VacancyMatching": "İlan ile yetenekleri eşleştir", + "Score": "Puan", + "Match": "Eşleştir", + "PerformMatch": "Eşleştir", + "MoveApplication": "Başka ilana taşı", + "SearchVacancy": "İlan ara...", + "Organizations": "Şirketler", + "TemplateReplace": "Yeni şablonu uygulamak istiyor musunuz?", + "TemplateReplaceConfirm": "Tüm alanlar yeni şablon değerleriyle değiştirilecek", + "Apply": "Uygula", + "OpenVacancyList": "Listeyi aç", + "Export": "Dışa aktar", + "ConfigLabel": "İşe Alım", + "ConfigDescription": "Yetenekleri/Başvuruları ve İlanları yönetmek için uzantı.", + "MyApplications": "Başvurularım", + "ShowApplications": "Başvuruları göster", + "GetTalentIds": "Yetenek id'lerini al", + "HideDoneState": "Tamamlanmış başvuruları gizle", + "HideArchivedVacancies": "Arşivlenmiş İlanları gizle", + "HideApplicantsFromArchivedVacancies": "Arşivlenmiş İlanlardan gizle", + "CreateNewSkills": "Mevcut bulunamazsa yeni yetenekler oluştur", + "SwapFirstAndLastNames": "Ad ve soyadı değiştir" + }, + "status": { + "ApplicationExists": "Başvuru zaten mevcut", + "TalentRequired": "Lütfen yetenek seçin", + "VacancyRequired": "Lütfen ilan seçin" + } +} diff --git a/plugins/recruit-assets/lang/zh.json b/plugins/recruit-assets/lang/zh.json index b59643db7a..c955529c2a 100644 --- a/plugins/recruit-assets/lang/zh.json +++ b/plugins/recruit-assets/lang/zh.json @@ -122,7 +122,9 @@ "HideArchivedVacancies": "隐藏已归档的职位", "HideApplicantsFromArchivedVacancies": "从已归档职位中隐藏", "CreateNewSkills": "如果未找到现有技能，则创建新技能", - "SwapFirstAndLastNames": "交换名字和姓氏" + "SwapFirstAndLastNames": "交换名字和姓氏", + "ForbidCreateVacancyPermission": "禁止创建职位", + "ForbidCreateVacancyPermissionDescription": "禁止用户创建新职位" }, "status": { "ApplicationExists": "申请已存在", diff --git a/plugins/recruit-resources/src/components/NewCandidateHeader.svelte b/plugins/recruit-resources/src/components/NewCandidateHeader.svelte index 297ea3d395..65baa2ed28 100644 --- a/plugins/recruit-resources/src/components/NewCandidateHeader.svelte +++ b/plugins/recruit-resources/src/components/NewCandidateHeader.svelte @@ -13,17 +13,24 @@ // limitations under the License. --> -
- -
- - + diff --git a/plugins/recruit/package.json b/plugins/recruit/package.json index 22c5f8e075..d7181ef89a 100644 --- a/plugins/recruit/package.json +++ b/plugins/recruit/package.json @@ -45,7 +45,8 @@ "@hcengineering/task": "^0.6.20", "@hcengineering/calendar": "^0.6.24", "@hcengineering/ui": "^0.6.15", - "@hcengineering/tags": "^0.6.16" + "@hcengineering/tags": "^0.6.16", + "@hcengineering/view": "^0.6.13" }, "repository": "https://github.com/hcengineering/platform", "publishConfig": { diff --git a/plugins/recruit/src/index.ts b/plugins/recruit/src/index.ts index ca2f008e06..8bcd3607b8 100644 --- a/plugins/recruit/src/index.ts +++ b/plugins/recruit/src/index.ts @@ -13,12 +13,13 @@ // limitations under the License. // -import type { Attribute, Class, Doc, Mixin, Ref, Status } from '@hcengineering/core' +import type { Attribute, Class, Doc, Mixin, Permission, Ref, Status } from '@hcengineering/core' import type { Asset, IntlString, Plugin, Resource } from '@hcengineering/platform' import { plugin } from '@hcengineering/platform' import type { ProjectTypeDescriptor, TaskType } from '@hcengineering/task' import { AnyComponent, Location, ResolvedLocation } from '@hcengineering/ui' import type { Applicant, ApplicantMatch, Candidate, Opinion, Review, Vacancy, VacancyList } from './types' +import { Action } from '@hcengineering/view' export * from './types' export * from './analytics' @@ -45,6 +46,9 @@ const recruit = plugin(recruitId, { descriptors: { VacancyType: '' as Ref }, + action: { + CreateTalent: '' as Ref> + }, mixin: { Candidate: '' as Ref>, VacancyList: '' as Ref>, @@ -63,7 +67,9 @@ const recruit = plugin(recruitId, { Application: '' as IntlString, Vacancy: '' as IntlString, Review: '' as IntlString, - Talent: '' as IntlString + Talent: '' as IntlString, + ForbidCreateVacancyPermission: '' as IntlString, + ForbidCreateVacancyPermissionDescription: '' as IntlString }, icon: { RecruitApplication: '' as Asset, @@ -87,6 +93,9 @@ const recruit = plugin(recruitId, { }, taskTypes: { Applicant: '' as Ref + }, + permission: { + ForbidCreateVacancy: '' as Ref } }) diff --git a/plugins/request-assets/lang/tr.json b/plugins/request-assets/lang/tr.json new file mode 100644 index 0000000000..13e5e12613 --- /dev/null +++ b/plugins/request-assets/lang/tr.json @@ -0,0 +1,25 @@ +{ + "string": { + "Requests": "Talepler", + "Request": "Talep", + "Approve": "Onayla", + "Approved": "Onaylandı", + "CreatedRequest": "Oluşturuldu: ", + "For": "İçin", + "Change": "Değiştir", + "Add": "Ekle", + "Remove": "Kaldır", + "Status": "Durum", + "Requested": "Talep Edildi", + "Completed": "Tamamlandı", + "Reject": "Reddet", + "Rejected": "Reddedildi", + "Comment": "Yorum", + "PleaseTypeMessage": "Devam etmek için lütfen yorum mesajı yazın...", + "NoRequests": "Talep yok", + "Cancel": "İptal", + "Cancelled": "İptal Edildi", + "NewRequest": "Yeni Talep", + "CancelRequest": "Talebi İptal Et" + } +} diff --git a/plugins/setting-assets/lang/cs.json b/plugins/setting-assets/lang/cs.json index 05955a3d38..006026a9a8 100644 --- a/plugins/setting-assets/lang/cs.json +++ b/plugins/setting-assets/lang/cs.json @@ -193,6 +193,9 @@ "Connected": "Připojené", "Available": "Dostupné", "NotConnectedIntegration": "Účet {account} není integrován s pracovním prostorem", - "IntegrationIsUnstable": "Služba integrace má problémy. Některé funkce nemusí fungovat správně." + "IntegrationIsUnstable": "Integrační služba má problémy. Některé funkce nemusí fungovat správně.", + "MinValue": "Minimální hodnota", + "MaxValue": "Maximální hodnota", + "IntegerOnly": "Pouze celá čísla" } } diff --git a/plugins/setting-assets/lang/de.json b/plugins/setting-assets/lang/de.json index f27162dd75..22712912b0 100644 --- a/plugins/setting-assets/lang/de.json +++ b/plugins/setting-assets/lang/de.json @@ -195,6 +195,9 @@ "Connected": "Verbunden", "Available": "Verfügbar", "NotConnectedIntegration": "Das Konto {account} ist nicht mit dem Arbeitsbereich integriert", - "IntegrationIsUnstable": "Der Integrationsdienst hat Probleme. Einige Funktionen funktionieren möglicherweise nicht richtig." + "IntegrationIsUnstable": "Der Integrationsdienst hat Probleme. Einige Funktionen funktionieren möglicherweise nicht richtig.", + "MinValue": "Minimalwert", + "MaxValue": "Maximalwert", + "IntegerOnly": "Nur ganze Zahlen" } } diff --git a/plugins/setting-assets/lang/en.json b/plugins/setting-assets/lang/en.json index ac15970647..42d5d81be9 100644 --- a/plugins/setting-assets/lang/en.json +++ b/plugins/setting-assets/lang/en.json @@ -195,6 +195,9 @@ "Connected": "Connected", "Available": "Available", "NotConnectedIntegration": "The account {account} is not integrated with the workspace", - "IntegrationIsUnstable": "Integration service is experiencing issues. Some features may not work properly." + "IntegrationIsUnstable": "Integration service is experiencing issues. Some features may not work properly.", + "MinValue": "Minimum value", + "MaxValue": "Maximum value", + "IntegerOnly": "Integer numbers only" } } diff --git a/plugins/setting-assets/lang/es.json b/plugins/setting-assets/lang/es.json index 2f93471af5..7dcf0014e6 100644 --- a/plugins/setting-assets/lang/es.json +++ b/plugins/setting-assets/lang/es.json @@ -186,6 +186,9 @@ "Connected": "Conectado", "Available": "Disponible", "NotConnectedIntegration": "La cuenta {account} no está integrada con el espacio de trabajo", - "IntegrationIsUnstable": "El servicio de integración está experimentando problemas. Algunas funciones pueden no funcionar correctamente." + "IntegrationIsUnstable": "El servicio de integración está experimentando problemas. Es posible que algunas funciones no funcionen correctamente.", + "MinValue": "Valor mínimo", + "MaxValue": "Valor máximo", + "IntegerOnly": "Solo números enteros" } } diff --git a/plugins/setting-assets/lang/fr.json b/plugins/setting-assets/lang/fr.json index 0ff0ac52c8..1ad81df5da 100644 --- a/plugins/setting-assets/lang/fr.json +++ b/plugins/setting-assets/lang/fr.json @@ -195,6 +195,9 @@ "Connected": "Connecté", "Available": "Disponible", "NotConnectedIntegration": "Le compte {account} n'est pas intégré au workspace", - "IntegrationIsUnstable": "Le service d'intégration rencontre des problèmes. Certaines fonctionnalités peuvent ne pas fonctionner correctement." + "IntegrationIsUnstable": "Le service d'intégration rencontre des problèmes. Certaines fonctionnalités peuvent ne pas fonctionner correctement.", + "MinValue": "Valeur minimale", + "MaxValue": "Valeur maximale", + "IntegerOnly": "Nombres entiers uniquement" } } diff --git a/plugins/setting-assets/lang/it.json b/plugins/setting-assets/lang/it.json index 6bd027ae84..c8a6dd2048 100644 --- a/plugins/setting-assets/lang/it.json +++ b/plugins/setting-assets/lang/it.json @@ -195,6 +195,9 @@ "Connected": "Connesso", "Available": "Disponibile", "NotConnectedIntegration": "L'account {account} non è integrato con il workspace", - "IntegrationIsUnstable": "Il servizio di integrazione sta riscontrando problemi. Alcune funzionalità potrebbero non funzionare correttamente." + "IntegrationIsUnstable": "L'integrazione è instabile. Alcune funzionalità potrebbero non funzionare correttamente.", + "MinValue": "Valore minimo", + "MaxValue": "Valore massimo", + "IntegerOnly": "Solo numeri interi" } } diff --git a/plugins/setting-assets/lang/ja.json b/plugins/setting-assets/lang/ja.json index 80833d81c5..bd985a94d1 100644 --- a/plugins/setting-assets/lang/ja.json +++ b/plugins/setting-assets/lang/ja.json @@ -195,6 +195,9 @@ "Connected": "接続済み", "Available": "利用可能", "NotConnectedIntegration": "アカウント {account} はワークスペースに統合されていません", - "IntegrationIsUnstable": "統合サービスに問題が発生しています。一部の機能が正しく動作しない可能性があります。" + "IntegrationIsUnstable": "統合サービスに問題が発生しています。一部の機能が正しく動作しない可能性があります。", + "MinValue": "最小値", + "MaxValue": "最大値", + "IntegerOnly": "整数のみ" } } diff --git a/plugins/setting-assets/lang/ru.json b/plugins/setting-assets/lang/ru.json index 5fff07ce24..9be6eba8a7 100644 --- a/plugins/setting-assets/lang/ru.json +++ b/plugins/setting-assets/lang/ru.json @@ -6,6 +6,9 @@ "Support": "Поддержка", "Privacy": "Конфиденциальность", "Terms": "Условия", + "MinValue": "Минимальное значение", + "MaxValue": "Максимальное значение", + "IntegerOnly": "Только целые числа", "AccountSettings": "Настройки аккаунта", "Categories": "Категории", "Delete": "Удалить", diff --git a/plugins/setting-assets/lang/tr.json b/plugins/setting-assets/lang/tr.json new file mode 100644 index 0000000000..151eac5774 --- /dev/null +++ b/plugins/setting-assets/lang/tr.json @@ -0,0 +1,203 @@ +{ + "string": { + "Setting": "Ayar", + "Spaces": "Alanlar", + "Integrations": "Entegrasyonlar", + "Support": "Destek", + "Privacy": "Gizlilik", + "Terms": "Koşullar", + "AccountSettings": "Hesap ayarları", + "Categories": "Kategoriler", + "Delete": "Sil", + "ChangePassword": "Şifreyi değiştir", + "CurrentPassword": "Mevcut şifre", + "NewPassword": "Yeni şifre", + "Disconnect": "Bağlantıyı kes", + "DisconnectAll": "Tümünün bağlantısını kes", + "Saving": "Kaydediliyor...", + "Saved": "Kaydedildi", + "Add": "Ekle", + "AddNew": "{type} Ekle", + "Proceed": "Devam et", + "NewEmail": "Yeni e-posta", + "SendConfirmation": "Onay kodu gönder", + "CodeSent": "Kod gönderildi. Lütfen aşağıdaki alana girin.", + "SendAgain": "Tekrar gönder", + "SendAgainIn": "Tekrar gönderilebilir:", + "Value": "Değer", + "EnterCurrentPassword": "Mevcut şifreyi girin", + "EnterNewPassword": "Yeni şifreyi girin", + "RepeatNewPassword": "Yeni şifreyi tekrarla", + "Signout": "Çıkış yap", + "Settings": "Ayarlar", + "SelectWorkspace": "Çalışma alanı seç", + "InviteWorkspace": "Çalışma alanına davet et", + "DeleteStatus": "Durumu sil", + "DeleteStatusConfirm": "Bu durumu silmek istiyor musunuz?", + "Reconnect": "Yeniden bağlan", + "IntegrationDisabled": " devre dışı bırakıldı", + "IntegrationDisabledSetting": "Entegrasyon devre dışı bırakıldı", + "IntegrationDisabledDescr": "Entegrasyon devre dışı", + "IntegrationWith": "Entegrasyon: ", + "ClassSetting": "Sınıf ayarı", + "ClassSettingHint": "Ortak bir özellik veya niteliğe sahip, tür, tip veya kalite bakımından diğerlerinden farklı bir öğe kümesi veya kategorisi.", + "ClassProperties": "Sınıf özellikleri", + "Classes": "Sınıflar", + "Attributes": "Öznitelikler", + "DeleteAttribute": "Özniteliği sil", + "DeleteAttributeConfirm": "Bu özniteliği silmek istiyor musunuz?", + "DeleteAttributeExistConfirm": "Bu özniteliği silmek istiyor musunuz? Veriler kaybolacak", + "DeleteMixin": "Mixin'i Sil", + "DeleteMixinConfirm": "Bu mixin'i silmek istiyor musunuz?", + "DeleteMixinExistConfirm": "Bu mixin'i silmek istiyor musunuz? Veriler kullanılamaz olacak", + "Attribute": "Öznitelik", + "Custom": "Özel", + "Type": "Tip", + "WithTime": "Zamanla", + "DateMode": "Tarih modu", + "CreatingAttribute": "Öznitelik oluşturuluyor", + "EditAttribute": "Özniteliği düzenle", + "CreateEnum": "Enum oluştur", + "EditEnum": "Enum'u düzenle", + "Enums": "Enum'lar", + "EnumsSettingHint": "Ortak bir özellik veya niteliğe sahip, tür, tip veya kalite bakımından diğerlerinden farklı bir öğe kümesi veya kategorisi.", + "EnumTitle": "Enum başlığı", + "EnumsCount": "{count, plural, =1 {# seçenek} other {# seçenek}}", + "ProjectTypesCount": "{count, plural, =0 {Proje tipi yok} =1 {# proje tipi} other {# proje tipi}}", + "Options": "Seçenekler", + "EnterOptionTitle": "Seçenek başlığı girin", + "NewEnumDialogClose": "Bu diyalogu kapatmak istiyor musunuz?", + "NewEnumDialogCloseNote": "Tüm değişiklikler kaybolacak", + "NewValue": "Yeni değer", + "Leave": "Çalışma alanından ayrıl", + "LeaveDescr": "Çalışma alanından ayrılmak istediğinizden emin misiniz? Bu işlem geri alınamaz.", + "Owners": "Sahipler", + "WorkspaceSettings": "Çalışma alanı ayarları", + "Select": "Seç", + "AddOwner": "Sahip ekle", + "ReadonlyGuest": "Salt okunur", + "Guest": "Misafir", + "User": "Kullanıcı", + "Maintainer": "Bakımcı", + "Owner": "Sahip", + "OwnerFirstName": "Sahibin Adı", + "OwnerLastName": "Sahibin Soyadı", + "Role": "Rol", + "FailedToSave": "Şifre güncellenemedi", + "ImportEnum": "Enum değerlerini içe aktar", + "ImportEnumCopy": "Enum değerlerini panodan kopyala", + "CreateMixin": "Mixin Oluştur", + "OldNames": "Eski değerler", + "NewClassName": "Yeni sınıf adı yazın veya önceki değerlerden seçin...", + "ShowAttribute": "Özniteliği göster", + "HideAttribute": "Özniteliği gizle", + "Visibility": "Görünürlük", + "Hidden": "Gizli", + "Configure": "Yapılandır", + "InviteSettings": "Davet ayarları", + "DefaultValue": "Varsayılan değer", + "SelectAValue": "Bir değer seç", + "DateOnly": "Sadece tarih", + "OnlyTime": "Sadece saat", + "DateAndTime": "Tarih ve saat", + "Configuration": "Yapılandırma", + "ConfigurationEnabled": "Etkin", + "ConfigurationDisabled": "Devre dışı", + "ConfigDisable": "Devre dışı bırak", + "ConfigEnable": "Etkinleştir", + "ConfigBeta": "Beta sürümü", + "Properties": "Özellikler", + "TaskTypes": "Görev tipleri", + "Automations": "Otomasyonlar", + "Collections": "Koleksiyonlar", + "ClassColon": "Sınıf:", + "SpaceTypes": "Alan tipleri", + "NewSpaceType": "Yeni alan tipi", + "SpaceTypeTitle": "Alan tipi başlığı", + "General": "Genel", + "Description": "Açıklama", + "CountSpaces": "{count, plural, =0 {Alan yok} =1 {# alan} other {# alan}}", + "Roles": "Roller", + "RoleName": "Rol adı", + "Permissions": "İzinler", + "Assignees": "Atananlar", + "DeleteRole": "Rolü sil", + "DeleteRoleConfirmation": "Bu rolü silmek istediğinizden emin misiniz? Bu role sahip tüm kullanıcılar izinlerini kaybedecek.", + "DeleteWorkspace": "Çalışma alanını sil", + "DeleteWorkspaceConfirm": "Bu çalışma alanını silmek istediğinizden emin misiniz? Siz ve diğer tüm üyeler bu çalışma alanına erişimi kaybedecek. Çalışma alanındaki tüm bilgiler kaybolacak. Bu işlem geri alınamaz. Devam etmek istiyor musunuz?", + "DeleteSpaceType": "Alan tipini sil", + "DeleteSpaceTypeConfirm": "Bu alan tipini silmek istediğinizden emin misiniz?", + "WorkspaceName": "Çalışma alanı adı", + "Workspace": "Çalışma alanı", + "OwnerOrMaintainerRequired": "Çalışma alanı Sahibi veya Bakımcısı olmanız gerekiyor", + "Backup": "Yedek", + "BackupLast": "Son yedekleme", + "BackupTotalSnapshots": "Toplam Anlık Görüntü", + "BackupTotalFiles": "Dosyalar", + "BackupSize": "Yedek boyutu", + "BackupLinkInfo": "wget veya curl gibi araçlarla özyinelemeli olarak indirilebilen bir yedekleme dizininin URL'si.", + "BackupBearerTokenInfo": "Yedeklemeye erişmek için bir bearer token gereklidir.", + "BackupSnapshots": "Yedek Anlık Görüntüleri", + "BackupFileDownload": "Dosya İndir", + "BackupFiles": "Yedek Dosyaları", + "BackupNoBackup": "Şu anda kullanılabilir yedek yok.", + "NonBackupedBlobs": "Yedeklenmemiş blob'lar", + "Calendar": "Takvim", + "StartOfTheWeek": "Haftanın başlangıcı", + "SystemSetupString": "Sistem Kurulumu ({day})", + "DefaultString": "Varsayılan ({day})", + "AddAttribute": "Öznitelik ekle", + "WorkspaceNamePattern": "İsim 40 karakter veya daha kısa, boş olmamalı ve özel karakterler (<, >, /) içermemelidir", + "Mailboxes": "Posta Kutuları", + "CreateMailbox": "Posta kutusu oluştur", + "CreateMailboxPlaceholder": "guzel-isim", + "MailboxNoDomains": "E-posta alan adları yapılandırılmamış", + "MailboxLimitReached": "Posta kutusu limitine ulaşıldı", + "MailboxErrorInvalidName": "Posta kutusu adı geçersiz", + "MailboxErrorDomainNotFound": "Alan adı bulunamadı", + "MailboxErrorNameRulesViolated": "Posta kutusu adı {minLen} ile {maxLen} karakter uzunluğunda olmalı", + "MailboxErrorMailboxExists": "Bu posta kutusu adı zaten kullanılıyor", + "MailboxErrorMailboxCountLimit": "Hesabınız için posta kutusu sayı limitine ulaşıldı", + "DeleteMailbox": "Posta kutusunu sil", + "MailboxDeleteConfirmation": "Bu posta kutusunu silmek istediğinizden emin misiniz?", + "DisablePermissions": "Rol tabanlı erişim kontrolünü devre dışı bırak", + "EnablePermissions": "Rol tabanlı erişim kontrolünü etkinleştir", + "DisablePermissionsConfirmation": "Rol tabanlı erişim kontrolünü devre dışı bırakmak istediğinizden emin misiniz? Tüm roller ve izinler devre dışı kalacak.", + "EnablePermissionsConfirmation": "Rol tabanlı erişim kontrolünü etkinleştirmek istediğinizden emin misiniz? Tüm roller ve izinler etkinleştirilecek.", + "BetaWarning": "Beta olarak etiketlenmiş modüller deneysel amaçlarla mevcuttur ve tamamen işlevsel olmayabilir. Şu anda kritik işler için beta özelliklere güvenmenizi önermiyoruz.", + "IntegrationFailed": "Entegrasyon oluşturulamadı", + "IntegrationError": "Lütfen tekrar deneyin veya sorun devam ederse destekle iletişime geçin", + "EmailIsUsed": "E-posta adresi başka bir hesap tarafından zaten kullanılıyor", + "Customize": "Özelleştir", + "GuestAccess": "Anonim misafirler", + "GuestAccessDescription": "Anonim kullanıcıların çalışma alanınızı salt okunur modda ziyaret etmesine izin verir", + "GuestSignUpDescription": "Anonim kullanıcıların çalışma alanınıza sınırlı düzenleme haklarıyla misafir olarak katılmasına izin verir", + "GuestChannelsDescription": "Misafirlerin katıldıktan sonra mesaj yazabileceği kanallar", + "GuestChannelsArrayLabel": "Kanalları seç", + "ManageIdentities": "Kimlikleri yönet", + "Release": "Serbest bırak", + "ReleaseSocialId": "Sosyal ID'yi serbest bırak", + "ReleaseSocialIdConfirm": "Bu sosyal ID'yi serbest bırakmak istediğinizden emin misiniz: {socialId}? Bu, hesabınızdan kaldırılacak ve artık giriş yapmak için kullanamazsınız. Ayrıca, ilgili tüm entegrasyonlar kaldırılacak.", + "ReleasePrimarySocialId": "Birincil sosyal ID'yi serbest bırak", + "ReleasePrimarySocialIdConfirm": "Mevcut birincil sosyal id'nizi serbest bırakmak sayfanın yeniden yüklenmesini gerektirecek. Devam etmek istediğinizden emin misiniz?", + "Login": "Giriş", + "Primary": "Birincil", + "MyIntegrations": "Entegrasyonlarım", + "AllIntegrations": "Tümü", + "ConnectedIntegrations": "Entegre", + "AvailableIntegrations": "Kullanılabilir", + "Connect": "Bağlan", + "Integrate": "Entegre et", + "FailedToLoadIntegrations": "Entegrasyonlar yüklenemedi", + "FailedToDisconnect": "Entegrasyon bağlantısı kesilemedi", + "ServiceIsUnavailable": "Servis kullanılamıyor", + "Integrated": "Entegre", + "Connected": "Bağlandı", + "Available": "Kullanılabilir", + "NotConnectedIntegration": "{account} hesabı çalışma alanıyla entegre değil", + "IntegrationIsUnstable": "Entegrasyon servisi sorunlar yaşıyor. Bazı özellikler düzgün çalışmayabilir.", + "MinValue": "Minimum değer", + "MaxValue": "Maksimum değer", + "IntegerOnly": "Sadece tam sayılar" + } +} diff --git a/plugins/setting-assets/lang/zh.json b/plugins/setting-assets/lang/zh.json index 1c9e77bde4..e38267b81c 100644 --- a/plugins/setting-assets/lang/zh.json +++ b/plugins/setting-assets/lang/zh.json @@ -195,6 +195,9 @@ "Connected": "已连接", "Available": "可用", "NotConnectedIntegration": "帐户 {account} 未与工作区集成", - "IntegrationIsUnstable": "集成服务出现问题。某些功能可能无法正常工作。" + "IntegrationIsUnstable": "集成服务出现问题。某些功能可能无法正常工作。", + "MinValue": "最小值", + "MaxValue": "最大值", + "IntegerOnly": "仅整数" } } diff --git a/plugins/setting-resources/src/components/EditEnum.svelte b/plugins/setting-resources/src/components/EditEnum.svelte index 8eab13c8cf..0594aa5a3c 100644 --- a/plugins/setting-resources/src/components/EditEnum.svelte +++ b/plugins/setting-resources/src/components/EditEnum.svelte @@ -52,17 +52,18 @@ async function save (): Promise { if (value === undefined) { - await client.createDoc(core.class.Enum, core.space.Model, { + const _id = await client.createDoc(core.class.Enum, core.space.Model, { name, enumValues: values }) + dispatch('close', _id) } else { await client.update(value, { name, enumValues: values }) + dispatch('close', value._id) } - dispatch('close') } function add (): void { diff --git a/plugins/setting-resources/src/components/socialIds/SocialIdPresenter.svelte b/plugins/setting-resources/src/components/socialIds/SocialIdRow.svelte similarity index 88% rename from plugins/setting-resources/src/components/socialIds/SocialIdPresenter.svelte rename to plugins/setting-resources/src/components/socialIds/SocialIdRow.svelte index fed4c36f1d..b7abd89244 100644 --- a/plugins/setting-resources/src/components/socialIds/SocialIdPresenter.svelte +++ b/plugins/setting-resources/src/components/socialIds/SocialIdRow.svelte @@ -21,16 +21,9 @@ setCurrentAccount, SocialId } from '@hcengineering/core' - import { - Button, - getPlatformColorDef, - Icon, - Label, - PaletteColorIndexes, - showPopup, - themeStore - } from '@hcengineering/ui' - import contact, { SocialIdentityProvider, SocialIdentityRef } from '@hcengineering/contact' + import { Button, getPlatformColorDef, Label, PaletteColorIndexes, showPopup, themeStore } from '@hcengineering/ui' + import contact, { SocialIdentity, SocialIdentityProvider, SocialIdentityRef } from '@hcengineering/contact' + import { SocialIdentityPresenter } from '@hcengineering/contact-resources' import { getClient, MessageBox } from '@hcengineering/presentation' import { setPlatformStatus, unknownError } from '@hcengineering/platform' @@ -46,7 +39,6 @@ const dispatch = createEventDispatcher() let currAcc = getCurrentAccount() - $: icon = socialIdProvider?.icon ?? contact.icon.Profile $: isLogin = loginSocialTypes.includes(socialId.type) $: isPrimary = socialId._id === currAcc.primarySocialId @@ -116,15 +108,12 @@ } }) } + + $: socialIdentity = socialId as SocialIdentity
-
- -
-
{socialId.displayValue ?? socialId.value}
-
-
+
@@ -165,16 +154,6 @@ display: none; } - .icon { - width: 1.75rem; - height: 1.75rem; - } - - .type { - color: var(--theme-dark-color); - font-size: 0.75rem; - } - .tag { margin-left: 0.5rem; padding: 0 0.875rem; diff --git a/plugins/setting-resources/src/components/socialIds/SocialIdsEditor.svelte b/plugins/setting-resources/src/components/socialIds/SocialIdsEditor.svelte index ae89e2a443..b6e0401315 100644 --- a/plugins/setting-resources/src/components/socialIds/SocialIdsEditor.svelte +++ b/plugins/setting-resources/src/components/socialIds/SocialIdsEditor.svelte @@ -19,7 +19,7 @@ import contact from '@hcengineering/contact' import view from '@hcengineering/view' - import SocialIdPresenter from './SocialIdPresenter.svelte' + import SocialIdRow from './SocialIdRow.svelte' import setting from '../../plugin' let account = getCurrentAccount() @@ -81,7 +81,7 @@ : true} {#if socialIdProvider != null && socialId.type !== SocialIdType.HULY}
- +
{/if} {/each} diff --git a/plugins/setting-resources/src/components/spaceTypes/RoleEditor.svelte b/plugins/setting-resources/src/components/spaceTypes/RoleEditor.svelte index e313a5d2b9..ce922336cf 100644 --- a/plugins/setting-resources/src/components/spaceTypes/RoleEditor.svelte +++ b/plugins/setting-resources/src/components/spaceTypes/RoleEditor.svelte @@ -42,6 +42,14 @@ const client = getClient() + let spacePermissions = descriptor.availablePermissions + if (spaceType._id === core.spaceType.SpacesType) { + const additionalPermissionsQuery = createQuery() + additionalPermissionsQuery.query(core.class.Permission, { scope: 'workspace' }, (res) => { + spacePermissions = descriptor.availablePermissions.concat(res.map((r) => r._id)) + }) + } + let role: Role | undefined const roleQuery = createQuery() $: roleQuery.query(core.class.Role, { _id: objectId }, (res) => { @@ -66,7 +74,7 @@ ObjectBoxPopup, { _class: core.class.Permission, - docQuery: { _id: { $in: descriptor.availablePermissions } }, + docQuery: { _id: { $in: spacePermissions } }, multiSelect: true, allowDeselect: true, selectedObjects: role.permissions diff --git a/plugins/setting-resources/src/components/typeEditors/NumberTypeEditor.svelte b/plugins/setting-resources/src/components/typeEditors/NumberTypeEditor.svelte index b1e43ea6de..1fa5cf1b48 100644 --- a/plugins/setting-resources/src/components/typeEditors/NumberTypeEditor.svelte +++ b/plugins/setting-resources/src/components/typeEditors/NumberTypeEditor.svelte @@ -13,12 +13,55 @@ // limitations under the License. --> + + + + +